summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>1997-02-08 14:04:30 +0000
committerjoerg <joerg@FreeBSD.org>1997-02-08 14:04:30 +0000
commita2359f4fa3330559d5f370565c734d3c26271a90 (patch)
tree538b2203a152e2130d370f3aab50350bcd1f0674 /lib
parent8a1d16660bffd1f931663fd6e083929b032910a5 (diff)
downloadFreeBSD-src-a2359f4fa3330559d5f370565c734d3c26271a90.zip
FreeBSD-src-a2359f4fa3330559d5f370565c734d3c26271a90.tar.gz
Do Andrey's homework :) before merging this into 2.2:
. add idempotency #ifdef . avoid sloppy common-style external declaration.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/locale/setlocale.c2
-rw-r--r--lib/libc/locale/setlocale.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 656ed85..b2f9072 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -98,6 +98,8 @@ extern int __time_load_locale __P((const char *)); /* strftime.c */
extern int _xpg4_setrunelocale __P((char *));
#endif
+char *_PathLocale;
+
char *
setlocale(category, locale)
int category;
diff --git a/lib/libc/locale/setlocale.h b/lib/libc/locale/setlocale.h
index d96abac..262b9c0 100644
--- a/lib/libc/locale/setlocale.h
+++ b/lib/libc/locale/setlocale.h
@@ -1,3 +1,5 @@
+#ifndef _SETLOCALE_H
+#define _SETLOCALE_H
/*
* Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
@@ -26,5 +28,6 @@
#define ENCODING_LEN 31
-char *_PathLocale;
+extern char *_PathLocale;
+#endif /* SETLOCALE_H */
OpenPOWER on IntegriCloud