proper symbol definition check for all AmigaOS flavours

10 files changed, 67 insertions, 20 deletions

diff --git a/lib/amigaos.c b/lib/amigaos.c
index 2427077a2..64696e848 100644
--- a/lib/amigaos.c
+++ b/lib/amigaos.c
@@ -21,7 +21,7 @@
  * $Id$
  ***************************************************************************/
 
-#if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(_WIN32_WCE)
+#ifdef __AMIGA__ /* Any AmigaOS flavour */
 
 #include "amigaos.h"
 #include <amitcp/socketbasetags.h>
@@ -75,4 +75,4 @@ BOOL amiga_init()
 ADD2EXIT(amiga_cleanup,-50);
 #endif
 
-#endif /* Not for Windows */
+#endif /* __AMIGA__ */
diff --git a/lib/amigaos.h b/lib/amigaos.h
index 8a5a857fd..ed3baf50e 100644
--- a/lib/amigaos.h
+++ b/lib/amigaos.h
@@ -1,3 +1,5 @@
+#ifndef LIBCURL_AMIGAOS_H
+#define LIBCURL_AMIGAOS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -21,10 +23,7 @@
  * $Id$
  ***************************************************************************/
 
-#if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(_WIN32_WCE)
-
-#ifndef LIBCURL_AMIGAOS_H
-#define LIBCURL_AMIGAOS_H
+#ifdef __AMIGA__ /* Any AmigaOS flavour */
 
 #ifndef __ixemul__
 
@@ -57,6 +56,6 @@ extern BOOL amiga_init();
 #warning compiling with ixemul...
 
 #endif /* __ixemul__ */
+#endif /* __AMIGA__ */
 #endif /* LIBCURL_AMIGAOS_H */
 
-#endif /* Not for Windows */
diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 0e48a206a..1859b2f6b 100644
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -1,6 +1,29 @@
-
 #ifndef LIBCURL_CONFIG_AMIGAOS_H
 #define LIBCURL_CONFIG_AMIGAOS_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#ifdef __AMIGA__ /* Any AmigaOS flavour */
 
 #define HAVE_ARPA_INET_H 1
 #define HAVE_GETHOSTBYADDR 1
@@ -116,4 +139,5 @@
 #define SEND_TYPE_ARG4 int
 #define SEND_TYPE_RETV int
 
+#endif /* __AMIGA__ */
 #endif /* LIBCURL_CONFIG_AMIGAOS_H */
diff --git a/lib/easy.c b/lib/easy.c
index d86f7cde5..c16654d65 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -231,7 +231,7 @@ CURLcode curl_global_init(long flags)
       return CURLE_FAILED_INIT;
     }
 
-#ifdef _AMIGASF
+#ifdef __AMIGA__
   if(!amiga_init()) {
     DEBUGF(fprintf(stderr, "Error: amiga_init failed\n"));
     return CURLE_FAILED_INIT;
@@ -298,7 +298,7 @@ void curl_global_cleanup(void)
   if (init_flags & CURL_GLOBAL_WIN32)
     win32_cleanup();
 
-#ifdef _AMIGASF
+#ifdef __AMIGA__
   amiga_cleanup();
 #endif
 
diff --git a/lib/if2ip.c b/lib/if2ip.c
index b4a98c662..b21727156 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -39,7 +39,7 @@
  */
 #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
-    !defined(_AMIGASF) && !defined(__minix)
+    !defined(__AMIGA__) && !defined(__minix)
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/lib/mprintf.c b/lib/mprintf.c
index 55a6f6295..10a8ad940 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -78,7 +78,7 @@
 # define BOOL char
 #endif
 
-#ifdef _AMIGASF
+#ifdef __AMIGA__
 # undef FORMAT_INT
 #endif
 
diff --git a/lib/setup.h b/lib/setup.h
index 007df45a2..201f374ba 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -63,7 +63,7 @@
 #include "config-mac.h"
 #endif
 
-#ifdef AMIGA
+#ifdef __AMIGA__
 #include "amigaos.h"
 #endif
 
diff --git a/src/config-amigaos.h b/src/config-amigaos.h
index e58af4df7..75b1fb82f 100644
--- a/src/config-amigaos.h
+++ b/src/config-amigaos.h
@@ -1,6 +1,29 @@
-
 #ifndef CURL_CONFIG_AMIGAOS_H
 #define CURL_CONFIG_AMIGAOS_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#ifdef __AMIGA__ /* Any AmigaOS flavour */
 
 /* Define to 1 if you want the built-in manual */
 #define USE_MANUAL 1
@@ -39,4 +62,5 @@
 # define        LONG_MIN        (-0x7fffffffL-1)        /* min value for a long */
 #endif
 
+#endif /* __AMIGA__ */
 #endif /* CURL_CONFIG_AMIGAOS_H */
diff --git a/src/main.c b/src/main.c
index 571b9da55..a48be2437 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2555,7 +2555,7 @@ static int parseconfig(const char *filename,
 
 #define CURLRC DOT_CHAR "curlrc"
 
-#ifndef AMIGA
+#ifndef __AMIGA__
     filename = CURLRC;   /* sensible default */
     home = homedir();    /* portable homedir finder */
     if(home) {
@@ -2604,7 +2604,7 @@ static int parseconfig(const char *filename,
       free(home); /* we've used it, now free it */
     }
 
-# else /* AmigaOS */
+# else /* __AMIGA__ */
   /* On AmigaOS all the config files are into env:
    */
   filename = "ENV:" CURLRC;
@@ -4462,7 +4462,7 @@ show_error:
           }
         }
 #endif
-#ifdef AMIGA
+#ifdef __AMIGA__
         /* Set the url as comment for the file. (up to 80 chars are allowed)
          */
         if( strlen(url) > 78 )
diff --git a/src/setup.h b/src/setup.h
index 641be4748..c0e29fcb5 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -56,7 +56,7 @@
 #include "config-riscos.h"
 #endif
 
-#ifdef __amigaos__
+#ifdef __AMIGA__
 #include "config-amigaos.h"
 #endif