update build infrastructure for pymalloc and bool changes

diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 88120baac6a648918962b08bb322af0dfdf1faab..f4ed5100e20c3aa0b622a3a8adc6af8135830949 100644 (file)
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -300,6 +300,7 @@ SRC.PYTHON= $(addprefix $(TOP), \
                Python/thread.c)
 SRC.OBJECT=    $(addprefix $(TOP), \
                Objects/abstract.c \
+               Objects/boolobject.c \
                Objects/bufferobject.c \
                Objects/cellobject.c \
                Objects/classobject.c \
@@ -318,6 +319,7 @@ SRC.OBJECT= $(addprefix $(TOP), \
                Objects/methodobject.c \
                Objects/moduleobject.c \
                Objects/object.c \
+               Objects/obmalloc.c \
                Objects/rangeobject.c \
                Objects/sliceobject.c \
                Objects/stringobject.c \

diff --git a/PC/os2emx/python23.def b/PC/os2emx/python23.def
index 00fe23a6d36bc8a989a454da957b209f40b12c8b..3b2e214b84e50bcaa021dc1d36af0d89865c504d 100644 (file)
--- a/PC/os2emx/python23.def
+++ b/PC/os2emx/python23.def
@@ -167,6 +167,14 @@ EXPORTS
   "PyObject_IsInstance"
   "PyObject_IsSubclass"
 
+; From python23_s.lib(boolobject)
+  "bool_repr"
+  "PyBool_FromLong"
+  "bool_new"
+  "_Py_ZeroStruct"
+  "_Py_TrueStruct"
+  "PyBool_Type"
+
 ; From python23_s.lib(bufferobject)
   "PyBuffer_FromObject"
   "PyBuffer_FromReadWriteObject"
@@ -302,9 +310,7 @@ EXPORTS
   "PyInt_FromString"
   "PyInt_FromUnicode"
   "PyInt_Fini"
-  "_Py_ZeroStruct"
   "PyInt_Type"
-  "_Py_TrueStruct"
 
 ; From python23_s.lib(iterobject)
   "PySeqIter_New"
@@ -404,9 +410,6 @@ EXPORTS
   "PyMem_Malloc"
   "PyMem_Realloc"
   "PyMem_Free"
-  "PyObject_Malloc"
-  "PyObject_Realloc"
-  "PyObject_Free"
   "Py_ReprEnter"
   "Py_ReprLeave"
   "_PyTrash_deposit_object"
@@ -418,6 +421,11 @@ EXPORTS
   "_PyTrash_delete_nesting"
   "_PyTrash_delete_later"
 
+; From python23_s.lib(obmalloc)
+  "PyObject_Malloc"
+  "PyObject_Realloc"
+  "PyObject_Free"
+
 ; From python23_s.lib(rangeobject)
   "PyRange_New"
   "PyRange_Type"
@@ -903,12 +911,15 @@ EXPORTS
 ; From python23_s.lib(gcmodule)
 ;  "initgc"
   "_PyGC_Dump"
+  "PyObject_GC_Track"
   "_PyObject_GC_Track"
+  "PyObject_GC_UnTrack"
   "_PyObject_GC_UnTrack"
   "_PyObject_GC_Malloc"
   "_PyObject_GC_New"
   "_PyObject_GC_NewVar"
   "_PyObject_GC_Resize"
+  "PyObject_GC_Del"
   "_PyObject_GC_Del"
   "_PyGC_generation0"