Module Name: src
Committed By: tnozaki
Date: Tue Jun 8 17:12:32 UTC 2010
Modified Files:
src/distrib/utils/libhack: setlocale.c
Log Message:
fix build breakage by multiple definition of __mb_cur_max.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/libhack/setlocale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/libhack/setlocale.c
diff -u src/distrib/utils/libhack/setlocale.c:1.4 src/distrib/utils/libhack/setlocale.c:1.5
--- src/distrib/utils/libhack/setlocale.c:1.4 Sat Jul 26 17:07:36 2003
+++ src/distrib/utils/libhack/setlocale.c Tue Jun 8 17:12:32 2010
@@ -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 <[email protected]>
* 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;
{