Source-Changes-HG archive

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

[src/trunk]: src/distrib/utils/libhack fix build breakage by multiple definit...



details:   https://anonhg.NetBSD.org/src/rev/910f16d38daf
branches:  trunk
changeset: 755532:910f16d38daf
user:      tnozaki <tnozaki%NetBSD.org@localhost>
date:      Tue Jun 08 17:12:32 2010 +0000

description:
fix build breakage by multiple definition of __mb_cur_max.

diffstat:

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

diffs (30 lines):

diff -r 5f94bcd5618a -r 910f16d38daf distrib/utils/libhack/setlocale.c
--- a/distrib/utils/libhack/setlocale.c Tue Jun 08 17:04:49 2010 +0000
+++ b/distrib/utils/libhack/setlocale.c Tue Jun 08 17:12:32 2010 +0000
@@ -1,13 +1,11 @@
-/*     $NetBSD: setlocale.c,v 1.4 2003/07/26 17:07:36 salo Exp $       */
+/*     $NetBSD: setlocale.c,v 1.5 2010/06/08 17:12:32 tnozaki Exp $    */
 
 /*
  * Written by Gordon W. Ross <gwr%NetBSD.org@localhost>
  * Public domain.
  */
 
-#include <sys/localedef.h>
 #include <stdlib.h>
-#define __SETLOCALE_SOURCE__
 #include <locale.h>
 
 /*
@@ -19,10 +17,8 @@
 
 static char current_locale[32] = { "C" };
 
-size_t __mb_cur_max = 1;
-
 char *
-__setlocale_mb_len_max_32(category, locale)
+setlocale(category, locale)
        int category;
        const char *locale;
 {



Home | Main Index | Thread Index | Old Index