diff options
| author | Yang Tse <yangsita@gmail.com> | 2007-02-28 14:45:48 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2007-02-28 14:45:48 +0000 |
| commit | be8a5d0aef8eef4236d7cd6ce2cd7eabf74006f4 (patch) | |
| tree | e6c9b255bd43b7c5ec553731aa2e0f2f815a1193 /src | |
| parent | dd433679e6cc5dbdf0ee26cc1ef111c3cfe64498 (diff) | |
proper symbol definition check for all AmigaOS flavours
Diffstat (limited to 'src')
| -rw-r--r-- | src/config-amigaos.h | 26 | ||||
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/setup.h | 4 |
3 files changed, 30 insertions, 6 deletions
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 |