minor reordering in OS/400 config/setup files

This commit is contained in:
Yang Tse
2008-07-22 00:12:06 +00:00
parent 0919de4511
commit f22114aeed
3 changed files with 22 additions and 10 deletions

View File

@@ -506,3 +506,15 @@
/* Use the system keyring as the default CA bundle. */ /* Use the system keyring as the default CA bundle. */
#define CURL_CA_BUNDLE "/QIBM/UserData/ICSS/Cert/Server/DEFAULT.KDB" #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. */

View File

@@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@@ -23,13 +23,6 @@
* $Id$ * $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. */ /* OS/400 netdb.h does not define NI_MAXHOST. */
#define NI_MAXHOST 1025 #define NI_MAXHOST 1025

View File

@@ -61,8 +61,7 @@
#endif #endif
#ifdef __OS400__ #ifdef __OS400__
#include "config-os400.h" # include "config-os400.h"
#include "setup-os400.h"
#endif #endif
#ifdef TPF #ifdef TPF
@@ -96,6 +95,14 @@
# define CURL_DISABLE_FILE # define CURL_DISABLE_FILE
#endif #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. * Include header files for windows builds before redefining anything.
* Use this preproessor block only to include or exclude windows.h, * Use this preproessor block only to include or exclude windows.h,