Commit f22114ae authored by Yang Tse's avatar Yang Tse
Browse files

minor reordering in OS/400 config/setup files

parent 0919de45

lib/config-os400.h

+12 −0
Original line number Diff line number Diff line
@@ -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. */

lib/setup-os400.h

+1 −8
Original line number Diff line number Diff line
@@ -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

lib/setup.h

+9 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 


#ifdef __OS400__

#  include "config-os400.h"

#include "setup-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,