[Expat-checkins] expat/xmlwf xmlfile.c, 1.19, 1.20 xmlwf.c, 1.73, 1.74

[Steven Solie]

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs17:/tmp/cvs-serv1696/xmlwf

Modified Files:
	xmlfile.c xmlwf.c 
Log Message:
Removed need for amiga_main().

Index: xmlfile.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- xmlfile.c	5 Aug 2006 22:43:57 -0000	1.19
+++ xmlfile.c	3 Jun 2007 15:00:09 -0000	1.20
@@ -12,7 +12,7 @@
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
-#elif defined(__amigaos4__)
+#elif defined(__amigaos__)
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
@@ -29,7 +29,7 @@
 #include <io.h>
 #endif
 
-#ifdef AMIGA_SHARED_LIB
+#if defined(__amigaos__) && defined(__USE_INLINE__)
 #include <proto/expat.h>
 #endif
 

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- xmlwf.c	30 Apr 2007 00:50:22 -0000	1.73
+++ xmlwf.c	3 Jun 2007 15:00:09 -0000	1.74
@@ -16,7 +16,7 @@
 #include <crtdbg.h>
 #endif
 
-#ifdef AMIGA_SHARED_LIB
+#if defined(__amigaos__) && defined(__USE_INLINE__)
 #include <proto/expat.h>
 #endif
 
@@ -639,13 +639,8 @@
   exit(rc);
 }
 
-#ifdef AMIGA_SHARED_LIB
-int
-amiga_main(int argc, char *argv[])
-#else
 int
 tmain(int argc, XML_Char **argv)
-#endif
 {
   int i, j;
   const XML_Char *outputDir = NULL;