Commit be8a5d0a authored by Yang Tse's avatar Yang Tse
Browse files

proper symbol definition check for all AmigaOS flavours

parent dd433679

lib/amigaos.c

+2 −2
Original line number Diff line number Diff line
@@ -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__ */

lib/amigaos.h

+4 −5
Original line number Diff line number Diff line 
#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 */

lib/config-amigaos.h

+25 −1
Original line number Diff line number Diff line 


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

lib/easy.c

+2 −2
Original line number Diff line number Diff line
@@ -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

lib/if2ip.c

+2 −2
Original line number Diff line number Diff line
@@ -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>