From 61525be632b8375255e6745bc318781fa15e47f2 Mon Sep 17 00:00:00 2001
From: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Date: Mon, 29 Mar 2004 11:58:55 +0000
Subject: [PATCH] OS/2 VACPP build updates/fixes

---
 Modules/posixmodule.c  | 2 +-
 PC/os2vacpp/makefile   | 1 +
 PC/os2vacpp/pyconfig.h | 2 +-
 PC/os2vacpp/python.def | 4 ++--
 Python/bltinmodule.c   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index cecd6bb1a131..ec4ec12a87c0 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 13eeb1921d19..4866cba32952 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 8a27059ed90f..c1562d1316b0 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("Python23.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 53769355f35b..e50483d53525 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        PYTHON23 INITINSTANCE TERMINSTANCE
+DESCRIPTION    'Python 2.3 Core DLL'
 PROTMODE
 DATA           MULTIPLE NONSHARED
 
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 8c7e025494f1..5edb7e5a4aa5 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -579,7 +579,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;
-- 
2.47.3