From a2600badfcf59c04624975a3e6d5ca15d3cb3e7c Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Fri, 16 Jul 1999 21:54:04 +0000 Subject: [PATCH] Enable external parameter entity parsing in expat. --- expat/Makefile.in | 2 -- expat/makefile.win | 2 -- expat/xmlparse/Makefile.in | 2 -- expat/xmlparse/makefile.win | 17 +++++++++++------ expat/xmltok/Makefile.in | 2 -- expat/xmltok/makefile.win | 14 +++++++++----- expat/xmltok/xmldef.h | 5 +++++ parser/expat/Makefile.in | 2 -- parser/expat/lib/Makefile.in | 2 -- parser/expat/lib/xmldef.h | 5 +++++ 10 files changed, 30 insertions(+), 23 deletions(-) diff --git a/expat/Makefile.in b/expat/Makefile.in index e8f3fa00479..0b9147fc718 100644 --- a/expat/Makefile.in +++ b/expat/Makefile.in @@ -24,8 +24,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = xmlparse xmltok # xmlwf -DEFINES += -DXML_DTD - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/expat/makefile.win b/expat/makefile.win index 1d421932796..3cf3be77599 100644 --- a/expat/makefile.win +++ b/expat/makefile.win @@ -6,8 +6,6 @@ DIRS= xmltok xmlparse MODULE=raptor LIBRARY_NAME=expat -DEFINES=-DXML_DTD - OBJS= \ .\xmlparse\$(OBJDIR)\hashtable.obj \ .\xmlparse\$(OBJDIR)\xmlparse.obj \ diff --git a/expat/xmlparse/Makefile.in b/expat/xmlparse/Makefile.in index 976e4bfddb2..dc935a7237b 100644 --- a/expat/xmlparse/Makefile.in +++ b/expat/xmlparse/Makefile.in @@ -28,8 +28,6 @@ ifdef MOZ_STRIP_NOT_EXPORTED DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))" endif -DEFINES += -DXML_DTD - CSRCS = \ hashtable.c \ xmlparse.c \ diff --git a/expat/xmlparse/makefile.win b/expat/xmlparse/makefile.win index b6468ffbd9f..5ffdc82c9db 100644 --- a/expat/xmlparse/makefile.win +++ b/expat/xmlparse/makefile.win @@ -18,16 +18,21 @@ # DEPTH= ..\.. -DEFINES=-DXML_DTD MODULE = expat EXPORTS = xmlparse.h -LINCS=-I..\xmltok -OBJS= \ - .\$(OBJDIR)\xmlparse.obj \ - .\$(OBJDIR)\hashtable.obj \ - $(NULL) +CPPSRCS= \ + xmlparse.c \ + hashtable.c \ + $(NULL) + +CPP_OBJS= \ + .\$(OBJDIR)\xmlparse.obj \ + .\$(OBJDIR)\hashtable.obj \ + $(NULL) + +LINCS=-I..\xmltok include <$(DEPTH)\config\rules.mak> diff --git a/expat/xmltok/Makefile.in b/expat/xmltok/Makefile.in index 34ada66edc0..38a9ce1a496 100644 --- a/expat/xmltok/Makefile.in +++ b/expat/xmltok/Makefile.in @@ -28,8 +28,6 @@ ifdef MOZ_STRIP_NOT_EXPORTED DEFINES += -DXMLTOKAPI="__attribute__ ((dllexport))" endif -DEFINES += -DXML_DTD - CSRCS = \ xmltok.c \ xmlrole.c \ diff --git a/expat/xmltok/makefile.win b/expat/xmltok/makefile.win index 53842ba8e8b..69cb8181adc 100644 --- a/expat/xmltok/makefile.win +++ b/expat/xmltok/makefile.win @@ -17,13 +17,17 @@ # -DEFINES=-DXML_DTD DEPTH= ..\.. -OBJS= \ - .\$(OBJDIR)\xmltok.obj \ - .\$(OBJDIR)\xmlrole.obj \ - $(NULL) +CPPSRCS= \ + xmltok.c \ + xmlrole.c \ + $(NULL) + +CPP_OBJS= \ + .\$(OBJDIR)\xmltok.obj \ + .\$(OBJDIR)\xmlrole.obj \ + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/expat/xmltok/xmldef.h b/expat/xmltok/xmldef.h index dfcd5759d4d..f55db97e81b 100644 --- a/expat/xmltok/xmldef.h +++ b/expat/xmltok/xmldef.h @@ -54,3 +54,8 @@ particular environments. */ /* Enable Unicode string processing in expat */ #define XML_UNICODE + +/* Enable external paramter entity parsing in expat */ +#ifndef XML_DTD +#define XML_DTD 1 +#endif \ No newline at end of file diff --git a/parser/expat/Makefile.in b/parser/expat/Makefile.in index e8f3fa00479..0b9147fc718 100644 --- a/parser/expat/Makefile.in +++ b/parser/expat/Makefile.in @@ -24,8 +24,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = xmlparse xmltok # xmlwf -DEFINES += -DXML_DTD - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/parser/expat/lib/Makefile.in b/parser/expat/lib/Makefile.in index 976e4bfddb2..dc935a7237b 100644 --- a/parser/expat/lib/Makefile.in +++ b/parser/expat/lib/Makefile.in @@ -28,8 +28,6 @@ ifdef MOZ_STRIP_NOT_EXPORTED DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))" endif -DEFINES += -DXML_DTD - CSRCS = \ hashtable.c \ xmlparse.c \ diff --git a/parser/expat/lib/xmldef.h b/parser/expat/lib/xmldef.h index dfcd5759d4d..f55db97e81b 100644 --- a/parser/expat/lib/xmldef.h +++ b/parser/expat/lib/xmldef.h @@ -54,3 +54,8 @@ particular environments. */ /* Enable Unicode string processing in expat */ #define XML_UNICODE + +/* Enable external paramter entity parsing in expat */ +#ifndef XML_DTD +#define XML_DTD 1 +#endif \ No newline at end of file