From ce67a0c64acfc4fb992bb166b220421ac4825b33 Mon Sep 17 00:00:00 2001 From: Bradley Nicholes Date: Fri, 30 May 2003 22:36:15 +0000 Subject: [PATCH] Fixing up the NetWare headers to be compatible with the GNU compiler MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Submitted by: G�nter Knauf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100116 13f79535-47bb-0310-9956-ffa450edef68 --- os/netware/pre_nw.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/os/netware/pre_nw.h b/os/netware/pre_nw.h index ce5ebe4833..bdf5f1ad19 100644 --- a/os/netware/pre_nw.h +++ b/os/netware/pre_nw.h @@ -1,9 +1,13 @@ #ifndef __pre_nw__ #define __pre_nw__ +#include + +#ifndef __GNUC__ #pragma precompile_target "precomp.mch" -#define NETWARE +#endif +#define NETWARE #define N_PLAT_NLM @@ -21,17 +25,15 @@ /* 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 #define __int64 long long -- 2.50.1