aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorDave Love <[email protected]>2000-06-23 14:28:20 +0000
committerDave Love <[email protected]>2000-06-23 14:28:20 +0000
commit68642df61fcb0d23744ae378aa97361093a01087 (patch)
tree174ed68c53529f3e71c52d230655fa56ab8dbc3f /src/xterm.c
parentaf5e64bc8ecbd20b7b2b39cec96c3afa9cdfa820 (diff)
Don't include sys/types.h unconditionally. Don't protect its inclusion
with !USG (following xmenu.c).
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 7c992eadfd..17aacf03ff 100644
--- 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
}