From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25866 invoked by alias); 19 May 2006 22:16:21 -0000 Received: (qmail 25823 invoked by uid 22791); 19 May 2006 22:16:20 -0000 X-Spam-Check-By: sourceware.org Received: from exsmtp01.agrinet.ch (HELO exsmtp01.agrinet.ch) (81.221.250.200) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 19 May 2006 22:16:06 +0000 Received: from smtp.messaging.ch ([10.50.250.214]) by exsmtp01.agrinet.ch with Microsoft SMTPSVC(6.0.3790.211); Sat, 20 May 2006 00:16:04 +0200 Received: from [192.168.225.5] ([80.219.226.40]) by smtp.messaging.ch with id bAGc1U0010svjJg0000000 for java-patches@gcc.gnu.org; Sat, 20 May 2006 00:16:36 +0200 X-IMP: RBL SBL+XBL: 0.00,RBL SPAMCOP: 0.00,RBL SORBS: 0.10,RBL MAPS_ORDB: 0.00,URL RHS: 0.00,URL SURBL: 0.00 Message-ID: <446E43A3.3080507@pop.agri.ch> Date: Fri, 19 May 2006 22:16:00 -0000 From: Andreas Tobler User-Agent: Thunderbird 1.5.0.2 (Macintosh/20060308) MIME-Version: 1.0 To: Java Patches Subject: [patch] include/posix.h Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2006-q2/txt/msg00206.txt.bz2 Hello all, to complete the HP-UX PA port we need to modify the file in the subject. We conflict with the gcj/javaprims.h and the Boolean.h when we compile java/net/natVMNetworkInterfacePosix.cc The reason comes from the system header sys/rw_lock.h: ----- /* * For source compatibility, need to continue defining TRUE and FALSE for * user-level applications. Although this file defines a kernel only service, * some user-level applications are indirectly including this file and * depending on the defines for TRUE and FALSE. These defines need to * remain until all the user-level issues have been handled. */ #ifndef _KERNEL #ifndef TRUE #define TRUE 1 #define FALSE 0 #else #if ((TRUE != 1) || (FALSE != 0)) This is probably not a good thing.... #endif #endif /* !TRUE */ ----- Do you have a better idea or is the below ok? Thanks, Andreas 2006-05-20 Andreas Tobler * include/posix.h: Undefine TRUE and FALSE. Index: include/posix.h =================================================================== --- include/posix.h (revision 113914) +++ include/posix.h (working copy) @@ -47,6 +47,8 @@ #else #define _Jv_platform_solib_suffix ".so" #endif +#undef TRUE +#undef FALSE // Some POSIX systems don't have O_SYNC and O_DYSNC so we define them here. // Needed in java/io/natFileDescriptorPosix.cc.