diff options
| author | Andrew MacIntyre <andymac@bullseye.apana.org.au> | 2004-03-29 11:53:38 (GMT) |
|---|---|---|
| committer | Andrew MacIntyre <andymac@bullseye.apana.org.au> | 2004-03-29 11:53:38 (GMT) |
| commit | da4d6cb57340f44ab72bc8f0284ca839372bbeb6 (patch) | |
| tree | 16e48b411d1f9d1706647218c26dc7bce9cd8d63 | |
| parent | 174175bf3a5522aa309915a34259bc13685ecf08 (diff) | |
| download | cpython-da4d6cb57340f44ab72bc8f0284ca839372bbeb6.zip cpython-da4d6cb57340f44ab72bc8f0284ca839372bbeb6.tar.gz cpython-da4d6cb57340f44ab72bc8f0284ca839372bbeb6.tar.bz2 | |
OS/2 VACPP build updates/fixes
| -rw-r--r-- | Modules/posixmodule.c | 2 | ||||
| -rw-r--r-- | PC/os2vacpp/makefile | 1 | ||||
| -rw-r--r-- | PC/os2vacpp/pyconfig.h | 2 | ||||
| -rw-r--r-- | PC/os2vacpp/python.def | 4 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index d674986..7a297ef 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -42,8 +42,8 @@ corresponding Unix manual entries for more information on calls."); #include <io.h> #include <stdio.h> #include <process.h> -#include "osdefs.h" #endif +#include "osdefs.h" #endif #include <sys/types.h> diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile index 13eeb19..4866cba 100644 --- a/PC/os2vacpp/makefile +++ b/PC/os2vacpp/makefile @@ -165,6 +165,7 @@ OBJECTS = \ $(PATHOBJ)\MethodObject.obj \ $(PATHOBJ)\ModuleObject.obj \ $(PATHOBJ)\Object.obj \ + $(PATHOBJ)\ObMalloc.obj \ $(PATHOBJ)\RangeObject.obj \ $(PATHOBJ)\SliceObject.obj \ $(PATHOBJ)\StringObject.obj \ diff --git a/PC/os2vacpp/pyconfig.h b/PC/os2vacpp/pyconfig.h index 0051d92..c858fe9 100644 --- a/PC/os2vacpp/pyconfig.h +++ b/PC/os2vacpp/pyconfig.h @@ -54,7 +54,7 @@ /* Provide a default library so writers of extension modules * won't have to explicitly specify it anymore */ -#pragma library("Python22.lib") +#pragma library("Python24.lib") /***************************************************/ /* 32-Bit IBM VisualAge C/C++ v3.0 for OS/2 */ diff --git a/PC/os2vacpp/python.def b/PC/os2vacpp/python.def index 5376935..8f1207b 100644 --- a/PC/os2vacpp/python.def +++ b/PC/os2vacpp/python.def @@ -1,5 +1,5 @@ -LIBRARY PYTHON22 INITINSTANCE TERMINSTANCE -DESCRIPTION 'Python 2.2 Core DLL' +LIBRARY PYTHON24 INITINSTANCE TERMINSTANCE +DESCRIPTION 'Python 2.4 Core DLL' PROTMODE DATA MULTIPLE NONSHARED diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 7321b74..b3c8b09 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -575,7 +575,7 @@ builtin_execfile(PyObject *self, PyObject *args) struct stat s; if (stat(filename, &s) == 0) { if (S_ISDIR(s.st_mode)) -# if defined(PY_OS2) && defined(PYCC_VACPP) +# if defined(PYOS_OS2) && defined(PYCC_VACPP) errno = EOS2ERR; # else errno = EISDIR; |