From cc551f25f4b5fb4b96962003f22a69032acdcb38 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <joerg@FreeBSD.org>
Date: Sat, 8 Feb 1997 14:04:30 +0000
Subject: [PATCH] Do Andrey's homework :) before merging this into 2.2:

. add idempotency #ifdef
. avoid sloppy common-style external declaration.
---
 lib/libc/locale/setlocale.c | 2 ++
 lib/libc/locale/setlocale.h | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 656ed85663f..b2f90725a62 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 d96abacbb10..262b9c0e4c2 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 */