You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2003/05/31 00:36:15 UTC
cvs commit: httpd-2.0/os/netware pre_nw.h
bnicholes 2003/05/30 15:36:15
Modified: os/netware pre_nw.h
Log:
Fixing up the NetWare headers to be compatible with the GNU compiler
Submitted by: G�nter Knauf <gk...@gknw.de>
Revision Changes Path
1.3 +7 -5 httpd-2.0/os/netware/pre_nw.h
Index: pre_nw.h
===================================================================
RCS file: /home/cvs/httpd-2.0/os/netware/pre_nw.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pre_nw.h 8 Jan 2002 21:16:08 -0000 1.2
+++ pre_nw.h 30 May 2003 22:36:15 -0000 1.3
@@ -1,9 +1,13 @@
#ifndef __pre_nw__
#define __pre_nw__
+#include <stdint.h>
+
+#ifndef __GNUC__
#pragma precompile_target "precomp.mch"
-#define NETWARE
+#endif
+#define NETWARE
#define N_PLAT_NLM
@@ -21,16 +25,14 @@
/* if we have wchar_t enabled in C++, predefine this type to avoid
a conflict in Novell's header files */
+#ifndef __GNUC__
#if (__option(cplusplus) && __option(wchar_type))
#define _WCHAR_T
#endif
+#endif
/* C9X defintion used by MSL C++ library */
#define DECIMAL_DIG 17
-
-/* define long long typedefs for Watcom compatiblity */
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
/* some code may want to use the MS convention for long long */
#ifndef __int64