OS/2 VACPP build updates/fixes

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>

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  \

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     */

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
 

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;