From 6c56340e1ab7c7fc0e98be2b074a38040ab4777e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 10 Dec 2003 13:53:35 +0000 Subject: native AmigaOS support by Diego Casorran --- lib/amigaos.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 lib/amigaos.h (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h new file mode 100644 index 000000000..23bb40c47 --- /dev/null +++ b/lib/amigaos.h @@ -0,0 +1,45 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2003, Daniel Stenberg, , 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$ + ***************************************************************************/ + +#ifndef CURL_AMIGAOS_H +#define CURL_AMIGAOS_H + +#ifndef __ixemul__ + +#include +#include + +#include +#include + +#include + +#define select(args...) WaitSelect( args, NULL) +#define inet_ntoa(x) Inet_NtoA( x ## .s_addr) + +#else /* __ixemul__ */ + +#warning compiling with ixemul... + +#endif /* __ixemul__ */ +#endif /* CURL_AMIGAOS_H */ -- cgit v1.2.1 From 053f6c85efd0bf698f73343989474d672d0563a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 7 Jan 2004 09:19:33 +0000 Subject: updated year in the copyright string --- lib/amigaos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index 23bb40c47..c2923bdaf 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 36f76396ea913b4596e6af3e7114e800d9aafef9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 13 Jan 2004 08:35:57 +0000 Subject: Diego Casorran's fixes to allow native AmigaOS builds --- lib/amigaos.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index c2923bdaf..f8529c46e 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -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 -#define select(args...) WaitSelect( args, NULL) +#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 */ -- cgit v1.2.1 From 39af394a1c3ae1d8ac71ad263a7c524988702c2e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 6 Oct 2004 07:50:18 +0000 Subject: removed tabs and trailing whitespace from source --- lib/amigaos.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index f8529c46e..0196eece7 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -36,10 +36,10 @@ #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 +#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(); -- cgit v1.2.1 From 16bbd13af7244cc0967d9f12327f63ffcaeac4bd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 13 Jul 2005 18:06:40 +0000 Subject: Diego Casorran patches to make (lib)curl build fine on Amiga again --- lib/amigaos.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index 0196eece7..a859ef77c 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -32,13 +32,19 @@ #include #include -#include +#include #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) +#ifndef select +# define select(args...) WaitSelect( args, NULL) +#endif +#ifndef inet_ntoa +# define inet_ntoa(x) Inet_NtoA( x ## .s_addr) +#endif +#ifndef ioctl +# define ioctl(a,b,c,d) IoctlSocket( (LONG)a, (ULONG)b, (char*)c) +#endif #define _AMIGASF 1 extern void amiga_cleanup(); -- cgit v1.2.1 From bda1e9aeab019d003036a3ec24193605bc191b3a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 9 Jan 2006 13:17:14 +0000 Subject: Made the copyright year match the latest modification's year. --- lib/amigaos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index a859ef77c..e5786d482 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 99dcd33f048598f209ea430b8d9f88bc7bb2bce9 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 28 Feb 2007 05:15:56 +0000 Subject: protect from themselves those who need it --- lib/amigaos.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index e5786d482..8a5a857fd 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,6 +21,8 @@ * $Id$ ***************************************************************************/ +#if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(_WIN32_WCE) + #ifndef LIBCURL_AMIGAOS_H #define LIBCURL_AMIGAOS_H @@ -56,3 +58,5 @@ extern BOOL amiga_init(); #endif /* __ixemul__ */ #endif /* LIBCURL_AMIGAOS_H */ + +#endif /* Not for Windows */ -- cgit v1.2.1 From be8a5d0aef8eef4236d7cd6ce2cd7eabf74006f4 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 28 Feb 2007 14:45:48 +0000 Subject: proper symbol definition check for all AmigaOS flavours --- lib/amigaos.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index 8a5a857fd..ed3baf50e 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -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 */ -- cgit v1.2.1 From 4e909ee8b1e7e9f174af629615224180568a7e92 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 24 Sep 2008 12:22:16 +0000 Subject: ntoa() and inet_ntoa_r() no longer used --- lib/amigaos.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index ed3baf50e..649c05f2e 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -40,9 +40,6 @@ #ifndef select # define select(args...) WaitSelect( args, NULL) #endif -#ifndef inet_ntoa -# define inet_ntoa(x) Inet_NtoA( x ## .s_addr) -#endif #ifndef ioctl # define ioctl(a,b,c,d) IoctlSocket( (LONG)a, (ULONG)b, (char*)c) #endif -- cgit v1.2.1 From 2309b4e330b96bc2e1f8e36b6184015e59544037 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 24 Mar 2010 11:02:54 +0100 Subject: remove the CVSish $Id$ lines --- lib/amigaos.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index 649c05f2e..d6ff0646a 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -20,7 +20,6 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ #ifdef __AMIGA__ /* Any AmigaOS flavour */ -- cgit v1.2.1 From 919c97fa65a5c00f7044e849eeb0095408413505 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 6 Apr 2012 23:35:15 +0200 Subject: curl tool: use configuration files from lib directory Configuration files such as curl_config.h and all config-*.h no longer exist nor are generated/copied into 'src' directory, now these only exist in 'lib' directory from where curl tool sources uses them. Additionally old src/setup.h has been refactored into src/tool_setup.h which now pulls lib/setup.h The possibility of a makefile needing an include path adjustment exists. --- lib/amigaos.h | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) (limited to 'lib/amigaos.h') diff --git a/lib/amigaos.h b/lib/amigaos.h index d6ff0646a..7476a13d8 100644 --- a/lib/amigaos.h +++ b/lib/amigaos.h @@ -1,5 +1,5 @@ -#ifndef LIBCURL_AMIGAOS_H -#define LIBCURL_AMIGAOS_H +#ifndef HEADER_CURL_AMIGAOS_H +#define HEADER_CURL_AMIGAOS_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,37 +21,19 @@ * KIND, either express or implied. * ***************************************************************************/ +#include "setup.h" -#ifdef __AMIGA__ /* Any AmigaOS flavour */ +#if defined(__AMIGA__) && !defined(__ixemul__) -#ifndef __ixemul__ +bool Curl_amiga_init(); +void Curl_amiga_cleanup(); -#include -#include +#else -#include -#include +#define Curl_amiga_init() 1 +#define Curl_amiga_cleanup() Curl_nop_stmt -#include - -#include "config-amigaos.h" - -#ifndef select -# define select(args...) WaitSelect( args, NULL) -#endif -#ifndef ioctl -# define ioctl(a,b,c,d) IoctlSocket( (LONG)a, (ULONG)b, (char*)c) #endif -#define _AMIGASF 1 - -extern void amiga_cleanup(); -extern BOOL amiga_init(); - -#else /* __ixemul__ */ - -#warning compiling with ixemul... -#endif /* __ixemul__ */ -#endif /* __AMIGA__ */ -#endif /* LIBCURL_AMIGAOS_H */ +#endif /* HEADER_CURL_AMIGAOS_H */ -- cgit v1.2.1