minor reordering in OS/400 config/setup files

diff --git a/lib/config-os400.h b/lib/config-os400.h
index f5ca8a2d7d779563f802575b279f7aaa73d44a75..d3b3d4585079268639c563a4d6940204ab6e2a38 100644 (file)
--- 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 d6e704ace898569f77aa319dfd2c8689250e263f..bf899759e5627d1884110435e0814b508a46fae5 100644 (file)
--- 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 c3a308abd1edb3f717f62e9e356e226697f8a814..1b5c6782ca70f2888168d218500a00861e6213e3 100644 (file)
--- 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
@@ -96,6 +95,14 @@
 #  define CURL_DISABLE_FILE
 #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,