bnicholes 2003/05/30 15:36:48
Modified: include/arch/netware apr_arch_pre_nw.h
Log:
Fixing up the NetWare headers to be compatible with the GNU compiler
Submitted by: G�nter Knauf <[EMAIL PROTECTED]>
Revision Changes Path
1.2 +7 -5 apr/include/arch/netware/apr_arch_pre_nw.h
Index: apr_arch_pre_nw.h
===================================================================
RCS file: /home/cvs/apr/include/arch/netware/apr_arch_pre_nw.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_pre_nw.h 6 Jan 2003 23:44:23 -0000 1.1
+++ apr_arch_pre_nw.h 30 May 2003 22:36:48 -0000 1.2
@@ -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,18 +25,16 @@
/* if we have wchar_t enabled in C++, predefine this type to avoid
a conflict in Novell's header files */
+#ifndef __GNUC__
#ifndef DOXYGEN
#if (__option(cplusplus) && __option(wchar_type))
#define _WCHAR_T
#endif
#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
