From: ayin <ayin>
Date: Thu, 18 Oct 2007 09:11:42 +0000 (+0000)
Subject: include cleanup.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=80158d7d445b57a71b999df3d867273dfcc2875b;p=dana%2Furxvt.git

include cleanup.
---

diff --git a/src/init.C b/src/init.C
index e10f0bf1..2cf02209 100644
--- a/src/init.C
+++ b/src/init.C
@@ -43,6 +43,19 @@
 
 #include <csignal>
 
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+
+#ifdef HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
+
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>
diff --git a/src/init.h b/src/init.h
index 9f8f8926..2e54e8d4 100644
--- a/src/init.h
+++ b/src/init.h
@@ -4,19 +4,6 @@
 #undef CERASE /* TODO */
 #define CERASE	'\010'	/* ^H */
 
-#ifdef HAVE_XSETLOCALE
-# define X_LOCALE
-# include <X11/Xlocale.h>
-#else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
-#endif
-
-#ifdef TTY_GID_SUPPORT
-# include <grp.h>
-#endif
-
 /* ways to deal with getting/setting termios structure */
 
 /* termios interface */
diff --git a/src/main.C b/src/main.C
index 90696592..22df33d2 100644
--- a/src/main.C
+++ b/src/main.C
@@ -40,14 +40,19 @@
 #include <csignal>
 #include <cstring>
 
-#ifdef TTY_GID_SUPPORT
-# include <grp.h>
-#endif
-
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
 #endif
 
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+
 vector<rxvt_term *> rxvt_term::termlist;
 
 // used to tell global functions which terminal instance is "active"
diff --git a/src/rxvtfont.h b/src/rxvtfont.h
index 7d845f4b..86281664 100644
--- a/src/rxvtfont.h
+++ b/src/rxvtfont.h
@@ -6,19 +6,6 @@
 # include <X11/Xft/Xft.h>
 #endif
 
-#ifdef HAVE_XSETLOCALE
-# define X_LOCALE
-# include <X11/Xlocale.h>
-#else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
-#endif
-
-#ifdef HAVE_NL_LANGINFO
-# include <langinfo.h>
-#endif
-
 #include <inttypes.h>
 
 #include "feature.h"