Commit 68642df6 authored by Dave Love's avatar Dave Love
Browse files

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

with !USG (following xmenu.c).
parent af5e64bc
...@@ -44,13 +44,11 @@ Boston, MA 02111-1307, USA. */ ...@@ -44,13 +44,11 @@ Boston, MA 02111-1307, USA. */
#include "xterm.h" #include "xterm.h"
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#ifndef USG
/* Load sys/types.h if not already loaded. /* Load sys/types.h if not already loaded.
In some systems loading it twice is suicidal. */ In some systems loading it twice is suicidal. */
#ifndef makedev #ifndef makedev
#include <sys/types.h> #include <sys/types.h>
#endif /* makedev */ #endif /* makedev */
#endif /* USG */
#ifdef BSD_SYSTEM #ifdef BSD_SYSTEM
#include <sys/ioctl.h> #include <sys/ioctl.h>
...@@ -94,7 +92,6 @@ Boston, MA 02111-1307, USA. */ ...@@ -94,7 +92,6 @@ Boston, MA 02111-1307, USA. */
#include <X11/Shell.h> #include <X11/Shell.h>
#endif #endif
#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif #endif
...@@ -11114,6 +11111,7 @@ xim_open_dpy (dpyinfo, resource_name) ...@@ -11114,6 +11111,7 @@ xim_open_dpy (dpyinfo, resource_name)
#ifdef HAVE_X11R6 #ifdef HAVE_X11R6
destroy.callback = xim_destroy_callback; destroy.callback = xim_destroy_callback;
destroy.client_data = (XPointer)dpyinfo; destroy.client_data = (XPointer)dpyinfo;
/* This isn't prptotyped in OSF 5.0. */
XSetIMValues (xim, XNDestroyCallback, &destroy, NULL); XSetIMValues (xim, XNDestroyCallback, &destroy, NULL);
#endif #endif
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment