Commit 36f76396 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Diego Casorran's fixes to allow native AmigaOS builds

parent 1cb3cd14

lib/amigaos.h

+11 −4
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
 * $Id$

 ***************************************************************************/



#ifndef CURL_AMIGAOS_H

#define CURL_AMIGAOS_H

#ifndef LIBCURL_AMIGAOS_H

#define LIBCURL_AMIGAOS_H



#ifndef __ixemul__
@@ -34,12 +34,19 @@ 


#include <bsdsocket.h>



#include "config-amigaos.h"



#define select(args...)	WaitSelect( args, NULL)

#define inet_ntoa(x)	Inet_NtoA( x ## .s_addr)

#define ioctl(a,b,c,d)	IoctlSocket( (LONG)a, (ULONG)b, (char*)c)

#define _AMIGASF	1



extern void amiga_cleanup();

extern BOOL amiga_init();



#else /* __ixemul__ */



#warning compiling with ixemul...



#endif /* __ixemul__ */

#endif /* CURL_AMIGAOS_H */
 
#endif /* LIBCURL_AMIGAOS_H */

lib/config-amigaos.h

+5 −0
Original line number Diff line number Diff line 


#ifndef LIBCURL_CONFIG_AMIGAOS_H

#define LIBCURL_CONFIG_AMIGAOS_H



#define HAVE_ARPA_INET_H 1

#define HAVE_GETHOSTBYADDR 1

#define HAVE_INET_ADDR 1
@@ -60,6 +63,7 @@ 
#define PACKAGE_STRING "curl -"

#define PACKAGE_TARNAME "curl"

#define PACKAGE_VERSION "-"

#define CURL_CA_BUNDLE "s:curl-ca-bundle.crt"



#define RETSIGTYPE void

#define SELECT_TYPE_ARG1 int
@@ -77,3 +81,4 @@ 
# define O_RDONLY 0x0000

#endif



#endif /* LIBCURL_CONFIG_AMIGAOS_H */

lib/easy.c

+9 −0
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ CURLcode curl_global_init(long flags) 
    if (win32_init() != CURLE_OK)

      return CURLE_FAILED_INIT;



#ifdef _AMIGASF

  if(!amiga_init())

    return CURLE_FAILED_INIT;

#endif



  initialized = 1;

  init_flags  = flags;
@@ -174,6 +179,10 @@ void curl_global_cleanup(void) 
  if (init_flags & CURL_GLOBAL_WIN32)

    win32_cleanup();



#ifdef _AMIGASF

  amiga_cleanup();

#endif



  initialized = 0;

  init_flags  = 0;

}

lib/setup.h

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ 
/* hand-modified MacOS config.h! */

#include "config-mac.h"

#endif

#ifdef AMIGA

#include "amigaos.h"

#endif



#endif
@@ -204,6 +207,12 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO) 


#endif



#ifdef _AMIGASF

#undef HAVE_ALARM

#undef sclose

#define sclose(x) CloseSocket(x)

#endif



#define DIR_CHAR      "/"

#define DOT_CHAR      "."

lib/timeval.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#endif



#ifndef HAVE_GETTIMEOFDAY

#if !defined(_WINSOCKAPI_) && !defined(__MINGW32__)

#if !defined(_WINSOCKAPI_) && !defined(__MINGW32__) && !defined(_AMIGASF)

struct timeval {

 long tv_sec;

 long tv_usec;