177 +++ Python-3.4.3/Modules/getpath.c 2015-08-13 08:51:05.849178060 -0700 |
177 +++ Python-3.4.3/Modules/getpath.c 2015-08-13 08:51:05.849178060 -0700 |
178 @@ -472,6 +472,7 @@ |
178 @@ -472,6 +472,7 @@ |
179 wchar_t argv0_path[MAXPATHLEN+1]; |
179 wchar_t argv0_path[MAXPATHLEN+1]; |
180 wchar_t zip_path[MAXPATHLEN+1]; |
180 wchar_t zip_path[MAXPATHLEN+1]; |
181 int pfound, efound; /* 1 if found; -1 if found build directory */ |
181 int pfound, efound; /* 1 if found; -1 if found build directory */ |
182 + boolean_t added_64 = B_FALSE; |
182 + boolean_t added_64 = _B_FALSE; |
183 wchar_t *buf; |
183 wchar_t *buf; |
184 size_t bufsz; |
184 size_t bufsz; |
185 size_t prefixsz; |
185 size_t prefixsz; |
186 @@ -697,6 +698,11 @@ |
186 @@ -697,6 +698,11 @@ |
187 wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); |
187 wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); |
188 joinpath(exec_prefix, L"lib/lib-dynload"); |
188 joinpath(exec_prefix, L"lib/lib-dynload"); |
189 } |
189 } |
190 + if (sizeof(void *) == 8 && wcslen(exec_prefix) + 3 <= MAXPATHLEN) { |
190 + if (sizeof(void *) == 8 && wcslen(exec_prefix) + 3 <= MAXPATHLEN) { |
191 + wcscat(exec_prefix, L"/64"); |
191 + wcscat(exec_prefix, L"/64"); |
192 + added_64 = B_TRUE; |
192 + added_64 = _B_TRUE; |
193 + } |
193 + } |
194 + |
194 + |
195 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ |
195 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ |
196 |
196 |
197 if ((!pfound || !efound) && !Py_FrozenFlag) |
197 if ((!pfound || !efound) && !Py_FrozenFlag) |