generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

proper symbol definition check for all AmigaOS flavours

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/amigaos.c
View File

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

9
lib/amigaos.h
View File

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

26
lib/config-amigaos.h
View File

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

4
lib/easy.c
View File

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

4
lib/if2ip.c
View File

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

2
lib/mprintf.c
View File

@ -78,7 +78,7 @@
# define BOOL char
#endif
#ifdef _AMIGASF
#ifdef __AMIGA__
# undef FORMAT_INT
#endif

2
lib/setup.h
View File

@ -63,7 +63,7 @@
#include "config-mac.h"
#endif
#ifdef AMIGA
#ifdef __AMIGA__
#include "amigaos.h"
#endif

26
src/config-amigaos.h
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 */

6
src/main.c
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 )

4
src/setup.h
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