Don't include sys/types.h unconditionally. Don't protect its inclusion

with !USG (following xmenu.c).

diff --git a/src/xterm.c b/src/xterm.c
index 7c992eadfde9146a49bc58430fa277affe982ac0..17aacf03ff7a62fdc0c7a534c79d380fd91ed3db 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -44,13 +44,11 @@ Boston, MA 02111-1307, USA.  */
 #include "xterm.h"
 #include <X11/cursorfont.h>
 
-#ifndef USG
 /* Load sys/types.h if not already loaded.
    In some systems loading it twice is suicidal.  */
 #ifndef makedev
 #include <sys/types.h>
 #endif /* makedev */
-#endif /* USG */
 
 #ifdef BSD_SYSTEM
 #include <sys/ioctl.h>
@@ -94,7 +92,6 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/Shell.h>
 #endif
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -11114,6 +11111,7 @@ xim_open_dpy (dpyinfo, resource_name)
 #ifdef HAVE_X11R6
       destroy.callback = xim_destroy_callback;
       destroy.client_data = (XPointer)dpyinfo;
+      /* This isn't prptotyped in OSF 5.0.  */
       XSetIMValues (xim, XNDestroyCallback, &destroy, NULL);
 #endif
     }