Source-Changes-HG archive

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

[src/netbsd-1-5]: src/distrib/utils/libhack pull up (approved by thopej):



details:   https://anonhg.NetBSD.org/src/rev/6fed63e42dcf
branches:  netbsd-1-5
changeset: 489068:6fed63e42dcf
user:      tshiozak <tshiozak%NetBSD.org@localhost>
date:      Fri Aug 11 22:06:19 2000 +0000

description:
pull up (approved by thopej):

 > Module Name:    basesrc
 > Committed By:   tshiozak
 > Date:           Fri Aug 11 19:58:35 UTC 2000
 >
 > Modified Files:
 >         basesrc/distrib/utils/libhack: setlocale.c
 >
 > Log Message:
 > Add __mb_cur_max and rename setlocale function.
 > (Lack of __mb_cur_max causes to import setlocale.o in libc.a
 > and causes conflict of symbol, pointed out by Johan Danielsson.)
 >
 >
 > To generate a diff of this commit:
 > cvs rdiff -r1.2 -r1.3 basesrc/distrib/utils/libhack/setlocale.c

diffstat:

 distrib/utils/libhack/setlocale.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 9f1b58de9cff -r 6fed63e42dcf distrib/utils/libhack/setlocale.c
--- a/distrib/utils/libhack/setlocale.c Fri Aug 11 20:53:33 2000 +0000
+++ b/distrib/utils/libhack/setlocale.c Fri Aug 11 22:06:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setlocale.c,v 1.2 1998/01/09 08:03:22 perry Exp $      */
+/*     $NetBSD: setlocale.c,v 1.2.10.1 2000/08/11 22:06:19 tshiozak Exp $      */
 
 /*
  * Written by Gordon W. Ross <gwr%netbsd.org@localhost>
@@ -6,6 +6,8 @@
  */
 
 #include <sys/localedef.h>
+#include <stdlib.h>
+#define __SETLOCALE_SOURCE__
 #include <locale.h>
 
 /*
@@ -17,8 +19,10 @@
 
 static char current_locale[32] = { "C" };
 
+size_t __mb_cur_max = 1;
+
 char *
-setlocale(category, locale)
+__setlocale_mb_len_max_32(category, locale)
        int category;
        const char *locale;
 {



Home | Main Index | Thread Index | Old Index