From owner-freebsd-current Mon Jun 17 19:52:12 2002 Delivered-To: freebsd-current@freebsd.org Received: from hawk.mail.pas.earthlink.net (hawk.mail.pas.earthlink.net [207.217.120.22]) by hub.freebsd.org (Postfix) with ESMTP id D422A37B434 for ; Mon, 17 Jun 2002 19:52:06 -0700 (PDT) Received: from pool0435.cvx40-bradley.dialup.earthlink.net ([216.244.43.180] helo=mindspring.com) by hawk.mail.pas.earthlink.net with esmtp (Exim 3.33 #2) id 17K963-0000OQ-00; Mon, 17 Jun 2002 19:51:55 -0700 Message-ID: <3D0EA022.7931AAF7@mindspring.com> Date: Mon, 17 Jun 2002 19:51:14 -0700 From: Terry Lambert X-Mailer: Mozilla 4.7 [en]C-CCK-MCD {Sony} (Win98; U) X-Accept-Language: en MIME-Version: 1.0 To: Martin Blapp , Garrett Wollman , Thomas David Rivers , current@FreeBSD.ORG Subject: Re: PATCH: wchar_t is already defined in libstd++ References: <20020618004555.U60170-100000@levais.imp.ch> <3D0E84DF.C836E631@mindspring.com> Content-Type: multipart/mixed; boundary="------------B77D1E0E025B7AA36CFC8CA5" Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This is a multi-part message in MIME format. --------------B77D1E0E025B7AA36CFC8CA5 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Terry Lambert wrote: > In any case, here is a patch for i386; you will need similar > patches for the other architectures. Oops. I messed the negative logic. BTW, that should be an #ifndef insdtead of a #ifdef in your original patch. Here is a corrected patch for ansi.h. -- Terry --------------B77D1E0E025B7AA36CFC8CA5 Content-Type: text/plain; charset=us-ascii; name="ansi.h.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ansi.h.diff" Index: ansi.h =================================================================== RCS file: /usr/cvs/src/sys/i386/include/ansi.h,v retrieving revision 1.18.2.4 diff -c -r1.18.2.4 ansi.h *** ansi.h 3 Jun 2001 17:15:54 -0000 1.18.2.4 --- ansi.h 18 Jun 2002 02:57:49 -0000 *************** *** 56,62 **** --- 56,64 ---- #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ long /* time()... */ #define _BSD_TIMER_T_ int /* timer_gettime()... */ + #if __GNUC__ < 3 || !defined(__cplusplus) #define _BSD_WCHAR_T_ _BSD_CT_RUNE_T_ /* wchar_t (see below) */ + #endif #define _BSD_WINT_T_ _BSD_CT_RUNE_T_ /* wint_t (see below) */ /* --------------B77D1E0E025B7AA36CFC8CA5-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message