--- rxvt-unicode/src/init.C	2010/12/14 08:01:51	1.286
+++ rxvt-unicode/src/init.C	2011/01/03 03:05:47	1.289
@@ -62,13 +62,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-/* these next two are probably only on Sun (not Solaris) */
+/* these next is probably only on Sun (not Solaris) */
 #ifdef HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
 #endif
-#ifdef HAVE_SYS_BYTEORDER_H
-#include <sys/byteorder.h>
-#endif
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -892,7 +889,6 @@
 void
 rxvt_term::init_env ()
 {
-  int i;
   char *val;
 
 #ifdef DISPLAY_IS_IP
@@ -916,8 +912,7 @@
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */
 
-  i = strlen (val);
-  env_display = (char *)rxvt_malloc (i + 9);
+  env_display = (char *)rxvt_malloc (strlen (val) + 9);
 
   sprintf (env_display, "DISPLAY=%s", val);
 
@@ -1509,7 +1504,7 @@
 #endif
   };
 
-  XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
+  XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
 
 #if ENABLE_FRILLS
   if (rs[Rs_transient_for])