diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-04-06 23:35:15 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-04-06 23:37:05 +0200 |
| commit | 919c97fa65a5c00f7044e849eeb0095408413505 (patch) | |
| tree | 12b5005946b744b178cf1fecd310941074cffa45 /lib/amigaos.h | |
| parent | 376b4d48feea9da98eda15ddf05c86729d9dc3f1 (diff) | |
| download | curl-919c97fa65a5c00f7044e849eeb0095408413505.tar.gz | |
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.
Diffstat (limited to 'lib/amigaos.h')
| -rw-r--r-- | lib/amigaos.h | 40 |
1 files changed, 11 insertions, 29 deletions
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, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -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 <exec/types.h> -#include <exec/execbase.h> +#else -#include <proto/exec.h> -#include <proto/dos.h> +#define Curl_amiga_init() 1 +#define Curl_amiga_cleanup() Curl_nop_stmt -#include <sys/socket.h> - -#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 */ |