diff options
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/pcbuild.dsw | 3 | ||||
| -rw-r--r-- | PC/_winreg.c | 2 | ||||
| -rw-r--r-- | PC/config.c | 4 | ||||
| -rw-r--r-- | PC/getpathp.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/PC/VC6/pcbuild.dsw b/PC/VC6/pcbuild.dsw index daf1535..bd3718d 100644 --- a/PC/VC6/pcbuild.dsw +++ b/PC/VC6/pcbuild.dsw @@ -26,6 +26,9 @@ Package=<5> Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name pythoncore
+ End Project Dependency
}}}
###############################################################################
diff --git a/PC/_winreg.c b/PC/_winreg.c index bacb9dd..b981ee3 100644 --- a/PC/_winreg.c +++ b/PC/_winreg.c @@ -697,7 +697,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize) case REG_DWORD: if (value != Py_None && !PyInt_Check(value)) return FALSE; - *retDataBuf = (BYTE *)PyMem_NEW(DWORD, sizeof(DWORD)); + *retDataBuf = (BYTE *)PyMem_NEW(DWORD, 1); if (*retDataBuf==NULL){ PyErr_NoMemory(); return FALSE; diff --git a/PC/config.c b/PC/config.c index 0885cdc..e8cb1d2 100644 --- a/PC/config.c +++ b/PC/config.c @@ -43,7 +43,7 @@ extern void initxxsubtype(void); extern void initzipimport(void); extern void init_random(void); extern void inititertools(void); -extern void initcollections(void); +extern void init_collections(void); extern void init_heapq(void); extern void init_bisect(void); extern void init_symtable(void); @@ -126,7 +126,7 @@ struct _inittab _PyImport_Inittab[] = { {"_heapq", init_heapq}, {"_lsprof", init_lsprof}, {"itertools", inititertools}, - {"collections", initcollections}, + {"_collections", init_collections}, {"_symtable", init_symtable}, {"mmap", initmmap}, {"_csv", init_csv}, diff --git a/PC/getpathp.c b/PC/getpathp.c index 729d2e4..e62b936 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -650,7 +650,7 @@ calculate_path(void) start of the path in question - even if this is one character before the start of the buffer */ - while (*look != DELIM && look >= module_search_path) + while (look >= module_search_path && *look != DELIM) look--; nchars = lookEnd-look; strncpy(lookBuf, look+1, nchars); |