From cvs-return-16148-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Fri May 30 22:36:17 2003 Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 27859 invoked by uid 500); 30 May 2003 22:36:16 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 27841 invoked by uid 500); 30 May 2003 22:36:16 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 30 May 2003 22:36:15 -0000 Message-ID: <20030530223615.28083.qmail@icarus.apache.org> From: bnicholes@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/os/netware pre_nw.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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 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 + +#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