]> granicus.if.org Git - python/commitdiff
OS/2 VACPP build updates/fixes
authorAndrew MacIntyre <andymac@bullseye.apana.org.au>
Mon, 29 Mar 2004 11:53:38 +0000 (11:53 +0000)
committerAndrew MacIntyre <andymac@bullseye.apana.org.au>
Mon, 29 Mar 2004 11:53:38 +0000 (11:53 +0000)
Modules/posixmodule.c
PC/os2vacpp/makefile
PC/os2vacpp/pyconfig.h
PC/os2vacpp/python.def
Python/bltinmodule.c

index d674986af4c3e0e2afd50e5b26f4823c78cb60bc..7a297ef23148a055c02bdc3ce0f4a1474056b334 100644 (file)
@@ -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>
index 13eeb1921d1901c5d8949bd247ca71712f6227c0..4866cba329525f78df36e81cfb15e2c7d08236f7 100644 (file)
@@ -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  \
index 0051d92c0255acb844a108b6b8887ef9dfe3f97e..c858fe91e02febe765dbc521026922c12d67b7af 100644 (file)
@@ -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     */
index 53769355f35b724b32978078e4749ed2fdb42001..8f1207bf398156771751ba33d8eeb4b127780480 100644 (file)
@@ -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
 
index 7321b74c02be29d458b65fd1681670cdf79a796c..b3c8b09a31cf5c39e65fcc25b5168e4a3360ae8b 100644 (file)
@@ -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;