Merge branch 'tizen_base' of ssh://review.tizen.org:29418/platform/upstream/python3...
authorHyunjee Kim <hj0426.kim@samsung.com>
Thu, 23 May 2019 07:34:02 +0000 (16:34 +0900)
committerHyunjee Kim <hj0426.kim@samsung.com>
Thu, 23 May 2019 07:57:22 +0000 (16:57 +0900)
Change-Id: I0b17475f606d1a12f8b0a0e996ca7186b79182a3
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>
1  2 
Modules/getpath.c

index 40c3f52c5b0509509f60c3dbc05779098bed69eb,87ecc5573353134927608c639faf0197d9dc1ce3..67ceb876c36d591ec2ff0119386fd64ffff95af2
@@@ -110,32 -109,6 +110,29 @@@ extern "C" 
  #define LANDMARK L"os.py"
  #endif
  
- #ifndef BASE_LIB
- #define BASE_LIB "lib"
- #endif
 +#define DECODE_LOCALE_ERR(NAME, LEN) \
 +    ((LEN) == (size_t)-2) \
 +     ? _Py_INIT_USER_ERR("cannot decode " NAME) \
 +     : _Py_INIT_NO_MEMORY()
 +
 +typedef struct {
 +    wchar_t *path_env;                 /* PATH environment variable */
 +
 +    wchar_t *pythonpath;               /* PYTHONPATH define */
 +    wchar_t *prefix;                   /* PREFIX define */
 +    wchar_t *exec_prefix;              /* EXEC_PREFIX define */
 +
 +    wchar_t *lib_python;               /* "lib/pythonX.Y" */
 +    wchar_t argv0_path[MAXPATHLEN+1];
 +    wchar_t zip_path[MAXPATHLEN+1];    /* ".../lib/pythonXY.zip" */
 +
 +    int prefix_found;         /* found platform independent libraries? */
 +    int exec_prefix_found;    /* found the platform dependent libraries? */
 +} PyCalculatePath;
 +
 +static const wchar_t delimiter[2] = {DELIM, '\0'};
 +static const wchar_t separator[2] = {SEP, '\0'};
 +
  #ifndef BASE_LIB
  #define BASE_LIB "lib"
  #endif
@@@ -156,6 -135,6 +153,7 @@@ _Py_wstat(const wchar_t* path, struct s
      return err;
  }
  
++
  static void
  reduce(wchar_t *dir)
  {