proper symbol definition check for all AmigaOS flavours

This commit is contained in:
Yang Tse 2007-02-28 14:45:48 +00:00
parent dd433679e6
commit be8a5d0aef
10 changed files with 67 additions and 20 deletions

View file

@ -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 */

View file

@ -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 )

View file

@ -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