--- rxvt-unicode/src/main.C	2007/10/08 07:05:23	1.252
+++ rxvt-unicode/src/main.C	2007/10/18 09:11:42	1.254
@@ -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"
@@ -203,7 +208,8 @@
 
 // clean up the most important stuff, do *not* call x or free mem etc.
 // for use before an emergency exit
-void rxvt_term::emergency_cleanup ()
+void
+rxvt_term::emergency_cleanup ()
 {
   if (cmd_pid)
     kill (-cmd_pid, SIGHUP);
@@ -903,14 +909,16 @@
   return true;
 }
 
-void rxvt_term::set_string_property (Atom prop, const char *str, int len)
+void
+rxvt_term::set_string_property (Atom prop, const char *str, int len)
 {
   XChangeProperty (dpy, parent[0],
                    prop, XA_STRING, 8, PropModeReplace,
                    (const unsigned char *)str, len >= 0 ? len : strlen (str));
 }
 
-void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
+void
+rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
 {
   wchar_t *ws = rxvt_mbstowcs (str, len);
   char *s = rxvt_wcstoutf8 (ws);