diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-07-22 00:12:06 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-07-22 00:12:06 +0000 |
| commit | f22114aeeda6b54067966fec397e6a6d73d05426 (patch) | |
| tree | a57091255d39c72a4d8c8916d1b370c7e1a71e56 | |
| parent | 0919de451188b2aca609e0c7952b58a62a02ca9b (diff) | |
minor reordering in OS/400 config/setup files
| -rw-r--r-- | lib/config-os400.h | 12 | ||||
| -rw-r--r-- | lib/setup-os400.h | 9 | ||||
| -rw-r--r-- | lib/setup.h | 11 |
3 files changed, 22 insertions, 10 deletions
diff --git a/lib/config-os400.h b/lib/config-os400.h index f5ca8a2d7..d3b3d4585 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -506,3 +506,15 @@ /* Use the system keyring as the default CA bundle. */ #define CURL_CA_BUNDLE "/QIBM/UserData/ICSS/Cert/Server/DEFAULT.KDB" + +/* ---------------------------------------------------------------- */ +/* ADDITIONAL DEFINITIONS */ +/* ---------------------------------------------------------------- */ + +/* The following must be defined BEFORE system header files inclusion. */ + +#define __ptr128 /* No teraspace. */ +#define qadrt_use_fputc_inline /* Generate fputc() wrapper inline. */ +#define qadrt_use_fread_inline /* Generate fread() wrapper inline. */ +#define qadrt_use_fwrite_inline /* Generate fwrite() wrapper inline. */ + diff --git a/lib/setup-os400.h b/lib/setup-os400.h index d6e704ace..bf899759e 100644 --- a/lib/setup-os400.h +++ b/lib/setup-os400.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2008, 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 @@ -23,13 +23,6 @@ * $Id$ ***************************************************************************/ -/* The following must be defined BEFORE common header files inclusion. */ - -#define __ptr128 /* No teraspace. */ -#define qadrt_use_fputc_inline /* Generate fputc() wrapper inline. */ -#define qadrt_use_fread_inline /* Generate fread() wrapper inline. */ -#define qadrt_use_fwrite_inline /* Generate fwrite() wrapper inline. */ - /* OS/400 netdb.h does not define NI_MAXHOST. */ #define NI_MAXHOST 1025 diff --git a/lib/setup.h b/lib/setup.h index c3a308abd..1b5c6782c 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -61,8 +61,7 @@ #endif #ifdef __OS400__ -#include "config-os400.h" -#include "setup-os400.h" +# include "config-os400.h" #endif #ifdef TPF @@ -97,6 +96,14 @@ #endif /* + * OS/400 setup file includes some system headers. + */ + +#ifdef __OS400__ +# include "setup-os400.h" +#endif + +/* * Include header files for windows builds before redefining anything. * Use this preproessor block only to include or exclude windows.h, * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs |