Removed need for amiga_main().

diff --git a/expat/amiga/launch.c b/expat/amiga/launch.c
index 11bbf1c22aa576482103c28638d7604d158bedbe..73e526e7c07a00c1eaab8cd0c85775681b501721 100755 (executable)
--- a/expat/amiga/launch.c
+++ b/expat/amiga/launch.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2001-2005 Expat maintainers.
+** Copyright (c) 2001-2007 Expat maintainers.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -28,27 +28,17 @@ struct Library* ExpatBase = 0;
 struct ExpatIFace* IExpat = 0;
 
 
-int amiga_main(int argc, char** argv);
-void cleanup();
+void setup() __attribute__((constructor));
+void cleanup() __attribute__((destructor));
 
 
-int main(int argc, char** argv)
+void setup()
 {
-       int result = -1;
-
-       atexit(cleanup);
-
-       ExpatBase = OpenLibrary("expat.library", 2);
-       if ( ExpatBase != 0 )  {
-               IExpat = (struct ExpatIFace*)GetInterface(ExpatBase, "main", 1, NULL);
-               if ( IExpat != 0 )  {
-                       result = amiga_main(argc, argv);
-               }
+       ExpatBase = OpenLibrary("expat.library", 4);
+       IExpat = (struct ExpatIFace*)GetInterface(ExpatBase, "main", 1, NULL);
+       if ( IExpat == 0 )  {
+               DebugPrintF("Can't open expat.library\n");
        }
-
-       cleanup();
-
-       return result;
 }
 
 

diff --git a/expat/examples/elements.c b/expat/examples/elements.c
index 04a5399cf173db1fd2a1c8664aa3e104091afef1..6b8f85501b6cdb8f00e2d2be24936bbadd44c606 100644 (file)
--- a/expat/examples/elements.c
+++ b/expat/examples/elements.c
@@ -8,6 +8,10 @@
 #include <stdio.h>
 #include "expat.h"
 
+#if defined(__amigaos__) && defined(__USE_INLINE__)
+#include <proto/expat.h>
+#endif
+
 #ifdef XML_LARGE_SIZE
 #if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
 #define XML_FMT_INT_MOD "I64"
@@ -36,14 +40,8 @@ endElement(void *userData, const char *name)
   *depthPtr -= 1;
 }
 
-#ifdef AMIGA_SHARED_LIB
-#include <proto/expat.h>
-int
-amiga_main(int argc, char *argv[])
-#else
 int
 main(int argc, char *argv[])
-#endif
 {
   char buf[BUFSIZ];
   XML_Parser parser = XML_ParserCreate(NULL);

diff --git a/expat/examples/outline.c b/expat/examples/outline.c
index 78d539927d5e1518d01a63375a67f0f37c37332e..3a3c8385512a22bdfb18bfc3ef48b1252a22244c 100644 (file)
--- a/expat/examples/outline.c
+++ b/expat/examples/outline.c
@@ -25,6 +25,10 @@
 #include <stdio.h>
 #include <expat.h>
 
+#if defined(__amigaos__) && defined(__USE_INLINE__)
+#include <proto/expat.h>
+#endif
+
 #ifdef XML_LARGE_SIZE
 #if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
 #define XML_FMT_INT_MOD "I64"
@@ -65,14 +69,8 @@ end(void *data, const char *el)
   Depth--;
 }
 
-#ifdef AMIGA_SHARED_LIB
-#include <proto/expat.h>
-int
-amiga_main(int argc, char *argv[])
-#else
 int
 main(int argc, char *argv[])
-#endif
 {
   XML_Parser p = XML_ParserCreate(NULL);
   if (! p) {

diff --git a/expat/tests/benchmark/benchmark.c b/expat/tests/benchmark/benchmark.c
index 30a5284f8d6238818de3ac44f9a3625cef04940f..0f0fd18c1d5040bc63dc08b982479e31330bded8 100644 (file)
--- a/expat/tests/benchmark/benchmark.c
+++ b/expat/tests/benchmark/benchmark.c
@@ -4,6 +4,10 @@
 #include <time.h>
 #include "expat.h"
 
+#if defined(__amigaos__) && defined(__USE_INLINE__)
+#include <proto/expat.h>
+#endif
+
 #ifdef XML_LARGE_SIZE
 #define XML_FMT_INT_MOD "ll"
 #else
@@ -18,13 +22,7 @@ usage(const char *prog, int rc)
   exit(rc);
 }
 
-#ifdef AMIGA_SHARED_LIB
-#include <proto/expat.h>
-int
-amiga_main(int argc, char *argv[])
-#else
 int main (int argc, char *argv[]) 
-#endif
 {
   XML_Parser  parser;
   char        *XMLBuf, *XMLBufEnd, *XMLBufPtr;

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index fdb33c29eb1cd2561a03356708c77576dff2507e..3521c086bbbb0f48d058c0ff523095ede37983cf 100644 (file)
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -17,7 +17,7 @@
 #include "chardata.h"
 #include "minicheck.h"
 
-#ifdef AMIGA_SHARED_LIB
+#if defined(__amigaos__) && defined(__USE_INLINE__)
 #include <proto/expat.h>
 #endif
 
@@ -1482,13 +1482,8 @@ make_suite(void)
 }
 
 
-#ifdef AMIGA_SHARED_LIB
-int
-amiga_main(int argc, char *argv[])
-#else
 int
 main(int argc, char *argv[])
-#endif
 {
     int i, nf;
     int verbosity = CK_NORMAL;

diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 6c754463169671a19f5e0de7423e348f963c1065..99eeeaaef28d37fad03dc3df2a6abe6d249c0edf 100755 (executable)
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -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
 

diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c
index 82082a730144adb52d988a9c667d1a882b2e1427..41a433d3cede3a48af40cb460129cb782a1f8b8f 100755 (executable)
--- a/expat/xmlwf/xmlwf.c
+++ b/expat/xmlwf/xmlwf.c
@@ -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 @@ usage(const XML_Char *prog, int rc)
   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;