[Python-checkins] CVS: python/dist/src/PC/os2vacpp makefile,1.5,1.6 makefile.omk,1.2,1.3

Tim Peters tim_one@users.sourceforge.net
2001年12月03日 19:18:50 -0800

• Previous message: [Python-checkins] CVS: python/dist/src Makefile.pre.in,1.69,1.70
• Next message: [Python-checkins] CVS: python/dist/src/Parser grammar.c,2.19,2.20 grammar1.c,2.14,2.15 parser.c,2.20,2.21 pgen.c,2.19,2.20 assert.h,2.10,NONE
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

Update of /cvsroot/python/python/dist/src/PC/os2vacpp
In directory usw-pr-cvs1:/tmp/cvs-serv30254/python/PC/os2vacpp
Modified Files:
	makefile makefile.omk 
Log Message:
The parser doesn't need its own implementation of assert, and having its
own interfered with including Python.h. Remove Python's assert.h.
Index: makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile	2001年11月05日 02:45:58	1.5
--- makefile	2001年12月04日 03:18:47	1.6
***************
*** 793,797 ****
 	 $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
! mpzmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_PARSER)\assert.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
--- 793,797 ----
 	 $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
! mpzmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
***************
*** 973,977 ****
 	 $(PY_INCLUDE)\tupleobject.h
 
! regexpr.obj: $(PY_INCLUDE)\abstract.h $(PY_PARSER)\assert.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
--- 973,977 ----
 	 $(PY_INCLUDE)\tupleobject.h
 
! regexpr.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
***************
*** 1416,1420 ****
 	 $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
! longobject.obj: $(PY_INCLUDE)\abstract.h $(PY_PARSER)\assert.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
--- 1416,1420 ----
 	 $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
! longobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
 	 $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
 	 pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
***************
*** 1566,1574 ****
 	 $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
 
! grammar.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
 
! grammar1.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
--- 1566,1574 ----
 	 $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
 
! grammar.obj: $(PY_INCLUDE)\bitset.h pyconfig.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
 
! grammar1.obj: $(PY_INCLUDE)\bitset.h pyconfig.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\token.h
***************
*** 1591,1595 ****
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h
 
! parser.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\errcode.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\node.h $(PY_PARSER)\parser.h $(PY_INCLUDE)\pgenheaders.h \
--- 1591,1595 ----
 	 $(PY_INCLUDE)\pgenheaders.h $(PY_INCLUDE)\pydebug.h
 
! parser.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\errcode.h \
 	 $(PY_INCLUDE)\grammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\node.h $(PY_PARSER)\parser.h $(PY_INCLUDE)\pgenheaders.h \
***************
*** 1602,1606 ****
 	 $(PY_PARSER)\tokenizer.h
 
! pgen.obj: $(PY_PARSER)\assert.h $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \
 	 $(PY_INCLUDE)\metagrammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\node.h $(PY_PARSER)\pgen.h $(PY_INCLUDE)\pgenheaders.h \
--- 1602,1606 ----
 	 $(PY_PARSER)\tokenizer.h
 
! pgen.obj: $(PY_INCLUDE)\bitset.h pyconfig.h $(PY_INCLUDE)\grammar.h \
 	 $(PY_INCLUDE)\metagrammar.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
 	 $(PY_INCLUDE)\node.h $(PY_PARSER)\pgen.h $(PY_INCLUDE)\pgenheaders.h \
Index: makefile.omk
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/makefile.omk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.omk	2001年07月26日 13:41:05	1.2
--- makefile.omk	2001年12月04日 03:18:48	1.3
***************
*** 612,616 ****
 	 traceback.h tupleobject.h
 
! mpzmodule.obj: abstract.h assert.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
--- 612,616 ----
 	 traceback.h tupleobject.h
 
! mpzmodule.obj: abstract.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
***************
*** 717,721 ****
 	 sysmodule.h traceback.h tupleobject.h
 
! regexpr.obj: abstract.h assert.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
--- 717,721 ----
 	 sysmodule.h traceback.h tupleobject.h
 
! regexpr.obj: abstract.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
***************
*** 988,992 ****
 	 traceback.h tupleobject.h
 
! longobject.obj: abstract.h assert.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
--- 988,992 ----
 	 traceback.h tupleobject.h
 
! longobject.obj: abstract.h ceval.h classobject.h cobject.h \
 	 complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
 	 funcobject.h import.h intobject.h intrcheck.h listobject.h \
***************
*** 1077,1084 ****
 	 pgenheaders.h pydebug.h token.h
 
! grammar.obj: assert.h bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
 	 pgenheaders.h pydebug.h token.h
 
! grammar1.obj: assert.h bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
 	 pgenheaders.h pydebug.h token.h
 
--- 1077,1084 ----
 	 pgenheaders.h pydebug.h token.h
 
! grammar.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
 	 pgenheaders.h pydebug.h token.h
 
! grammar1.obj: bitset.h pyconfig.h grammar.h mymalloc.h myproto.h \
 	 pgenheaders.h pydebug.h token.h
 
***************
*** 1095,1099 ****
 node.obj: pyconfig.h mymalloc.h myproto.h node.h pgenheaders.h pydebug.h
 
! parser.obj: assert.h bitset.h pyconfig.h errcode.h grammar.h mymalloc.h \
 	 myproto.h node.h parser.h pgenheaders.h pydebug.h token.h
 
--- 1095,1099 ----
 node.obj: pyconfig.h mymalloc.h myproto.h node.h pgenheaders.h pydebug.h
 
! parser.obj: bitset.h pyconfig.h errcode.h grammar.h mymalloc.h \
 	 myproto.h node.h parser.h pgenheaders.h pydebug.h token.h
 
***************
*** 1102,1106 ****
 	 tokenizer.h
 
! pgen.obj: assert.h bitset.h pyconfig.h grammar.h metagrammar.h mymalloc.h \
 	 myproto.h node.h pgen.h pgenheaders.h pydebug.h token.h
 
--- 1102,1106 ----
 	 tokenizer.h
 
! pgen.obj: bitset.h pyconfig.h grammar.h metagrammar.h mymalloc.h \
 	 myproto.h node.h pgen.h pgenheaders.h pydebug.h token.h
 

---

• Previous message: [Python-checkins] CVS: python/dist/src Makefile.pre.in,1.69,1.70
• Next message: [Python-checkins] CVS: python/dist/src/Parser grammar.c,2.19,2.20 grammar1.c,2.14,2.15 parser.c,2.20,2.21 pgen.c,2.19,2.20 assert.h,2.10,NONE
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]