Always include locale.h from gettext.h so we no longer need to

include locale.h from the .c files.

include/gettext.h

@@ -21,7 +21,7 @@
  * Solaris locale.h includes libintl.h which causes problems when we
  * redefine the gettext functions.  We include it first to avoid this.
  */
-#if defined(HAVE_SETLOCALE) && defined(__sun__) && defined(__svr4__)
+#if defined(HAVE_SETLOCALE)
 # include <locale.h>
 #endif
 

plugins/sudoers/iolog_path.c

@@ -35,9 +35,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>

plugins/sudoers/locale.c

@@ -32,9 +32,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 
 #include "sudoers.h"
 

plugins/sudoers/regress/iolog_path/check_iolog_path.c

@@ -35,9 +35,6 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif /* HAVE_STRINGS_H */
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>

plugins/sudoers/sudoers.c

@@ -57,9 +57,6 @@
 #include <signal.h>
 #include <grp.h>
 #include <time.h>
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #include <netdb.h>
 #ifdef HAVE_LOGIN_CAP_H
 # include <login_cap.h>

plugins/sudoers/sudoreplay.c

@@ -82,9 +82,6 @@
 #ifdef HAVE_ZLIB_H
 # include <zlib.h>
 #endif
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #include <signal.h>
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>

plugins/sudoers/testsudoers.c

@@ -60,9 +60,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 
 #include "tsgetgrpw.h"
 #include "sudoers.h"

plugins/sudoers/visudo.c

@@ -71,9 +71,6 @@
 #if TIME_WITH_SYS_TIME
 # include <time.h>
 #endif
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 
 #include "sudoers.h"
 #include "parse.h"

src/error.c

@@ -22,9 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 
 #include "missing.h"
 #include "alloc.h"

src/exec.c

@@ -50,9 +50,6 @@
 #if TIME_WITH_SYS_TIME
 # include <time.h>
 #endif
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>

src/sesh.c

@@ -25,9 +25,6 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else

src/sudo.c

@@ -58,9 +58,6 @@
 #if TIME_WITH_SYS_TIME
 # include <time.h>
 #endif
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #ifdef HAVE_LOGIN_CAP_H
 # include <login_cap.h>
 # ifndef LOGIN_SETENV

src/sudo.h

@@ -17,8 +17,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: sudo.h,v 1.290 2009/12/12 16:12:26 millert Exp $
  */
 
 #ifndef _SUDO_SUDO_H