Mercurial > emacs

changeset 29894:691fe247f018

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't include sys/types.h unconditionally. Don't protect its inclusion with !USG (following xmenu.c).
author Dave Love <fx@gnu.org>
date Fri, 23 Jun 2000 14:28:20 +0000
parents 8dcca357af53
children 025b22133cc2
files src/xterm.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Fri Jun 23 13:59:33 2000 +0000
+++ b/src/xterm.c	Fri Jun 23 14:28:20 2000 +0000
@@ -44,13 +44,11 @@
 #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 @@
 #include <X11/Shell.h>
 #endif
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -11114,6 +11111,7 @@
 #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
     }