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

include locale.h from the .c files.

diff --git a/include/gettext.h b/include/gettext.h
index b3ea285ca43e4379f6d446c67aa86d142fc607a1..db1f3591088d5e1828b82f5063dd3afc483d5196 100644 (file)
--- a/include/gettext.h
+++ b/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
 

diff --git a/plugins/sudoers/iolog_path.c b/plugins/sudoers/iolog_path.c
index 1f615f3d76411a68cb089a02d30ceab5fbb778d1..db78d12ef120a1318e1134689e424c96cf610e9b 100644 (file)
--- a/plugins/sudoers/iolog_path.c
+++ b/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>

diff --git a/plugins/sudoers/locale.c b/plugins/sudoers/locale.c
index e82bb3ece5eeb1d57205b8aa0055ca09df3266e3..964afd4eeb291b1691e0bc8be82c91d7fd6c4a0b 100644 (file)
--- a/plugins/sudoers/locale.c
+++ b/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"
 

diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
index 3a8c2940d9c39802258b35e3db7ab5b52afe3fa7..fb743ef9676c9e6024190803d78b109def3b675e 100644 (file)
--- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c
+++ b/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>

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index ae85138e71aa012a829ad1b1576cadb5da735c8f..4f011f8bd3c0e4b11fbf6260c88ecd557e544b4c 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/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>

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index ae0c9d63ef2bd6924bce16ecd4567f8d352d3d48..0f49c7e1ab164b7f9c7db6a5371aa34dbd86c22c 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/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>

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 5594313fd7e7030b8f3a9918dec41e13d8c29335..109eaa3d0f22000c2a79b0e86464dcb3bc7028f7 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/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"

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index ca75af563f78786babb61ff863891ae1d78ed3fd..6df0d3fa9ddccc6e53f2bfa257f4601af5c54240 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/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"

diff --git a/src/error.c b/src/error.c
index 4db2f9d5c760006e032487fe63c60050342d7da0..6502df98df9186e23cfd5f176c072cfee5fccc0e 100644 (file)
--- a/src/error.c
+++ b/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"

diff --git a/src/exec.c b/src/exec.c
index 34a4da6cdb4deb94f0455380e597ae57fc8ac23f..808ed30bf1ff2927605198396637e35dbca6ab76 100644 (file)
--- a/src/exec.c
+++ b/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>

diff --git a/src/sesh.c b/src/sesh.c
index 12dacaee0db36e5201b8a895ee02047cecff5891..c6e41da907cfe349aa79fa2850883d5829e72f92 100644 (file)
--- a/src/sesh.c
+++ b/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

diff --git a/src/sudo.c b/src/sudo.c
index 61ae4800e9b33d059a54beee2c5ccba5a5ed9f37..ec82a141f887649228f30a71c45c914db1443167 100644 (file)
--- a/src/sudo.c
+++ b/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

diff --git a/src/sudo.h b/src/sudo.h
index 9436fa662bd4b4f735086c27a4e5e3d1d0255502..2034712df40fac12a088bb326a5c4d1e394953ab 100644 (file)
--- a/src/sudo.h
+++ b/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