Enable external parameter entity parsing in expat.

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

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      \

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 \

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>
 

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 \

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>
 

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

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

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 \

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