Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/mklocale On FreeBSD host define _DONT_USE_CTYPE_INLI...



details:   https://anonhg.NetBSD.org/src/rev/0723f627869b
branches:  trunk
changeset: 542354:0723f627869b
user:      uwe <uwe%NetBSD.org@localhost>
date:      Mon Jan 27 01:22:10 2003 +0000

description:
On FreeBSD host define _DONT_USE_CTYPE_INLINE_ before including ctype.h.
We pull in our _RuneLocale, while the inlines are for the host _RuneLocale.

diffstat:

 usr.bin/mklocale/lex.l  |  7 ++++---
 usr.bin/mklocale/yacc.y |  7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 1de3620b15dd -r 0723f627869b usr.bin/mklocale/lex.l
--- a/usr.bin/mklocale/lex.l    Mon Jan 27 01:17:47 2003 +0000
+++ b/usr.bin/mklocale/lex.l    Mon Jan 27 01:22:10 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lex.l,v 1.4 2002/01/29 10:20:35 tv Exp $       */
+/*     $NetBSD: lex.l,v 1.5 2003/01/27 01:22:10 uwe Exp $      */
 
 %{
 /*-
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)lex.l      8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: lex.l,v 1.4 2002/01/29 10:20:35 tv Exp $");
+__RCSID("$NetBSD: lex.l,v 1.5 2003/01/27 01:22:10 uwe Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -54,7 +54,8 @@
 #define _BSD_RUNE_T_    int
 #define _BSD_CT_RUNE_T_ rune_t
 #include "runetype.h"
-#else
+#else  /* __FreeBSD__ */
+#define _DONT_USE_CTYPE_INLINE_
 #include <ctype.h>
 #endif
 #include <stdio.h>
diff -r 1de3620b15dd -r 0723f627869b usr.bin/mklocale/yacc.y
--- a/usr.bin/mklocale/yacc.y   Mon Jan 27 01:17:47 2003 +0000
+++ b/usr.bin/mklocale/yacc.y   Mon Jan 27 01:22:10 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: yacc.y,v 1.10 2002/04/26 18:04:58 bjh21 Exp $  */
+/*     $NetBSD: yacc.y,v 1.11 2003/01/27 01:22:10 uwe Exp $    */
 
 %{
 /*-
@@ -47,7 +47,7 @@
 static char sccsid[] = "@(#)yacc.y     8.1 (Berkeley) 6/6/93";
 static char rcsid[] = "$FreeBSD$";
 #else
-__RCSID("$NetBSD: yacc.y,v 1.10 2002/04/26 18:04:58 bjh21 Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.11 2003/01/27 01:22:10 uwe Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -55,6 +55,9 @@
 #include <netinet/in.h>        /* Needed by <arpa/inet.h> on NetBSD 1.5. */
 #include <arpa/inet.h> /* Needed for htonl on POSIX systems. */
 
+#if defined(__FreeBSD__)
+#define _DONT_USE_CTYPE_INLINE_
+#endif
 #include <ctype.h>
 #include <err.h>
 #if !defined(__FreeBSD__)



Home | Main Index | Thread Index | Old Index