diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-07-05 09:31:36 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-07-05 09:31:36 +0000 |
| commit | 42cafbaf7101c443014ed1a254c8060c53048479 (patch) | |
| tree | 11b7f5fbf59813e9d58035ecc193b4be9d9c4197 /src/xfaces.c | |
| parent | 2000961c3e45fdbc83ace0332c067dec30dacd9b (diff) | |
| download | emacs-42cafbaf7101c443014ed1a254c8060c53048479.tar.gz | |
* xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including
<X11/Xos.h>, so that file doesn't try to define struct timeval and
struct timezone.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index de7b66036de..e5097b5ef8b 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -34,22 +34,24 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "blockinput.h" #include "window.h" -/* Compensate for bug in Xos.h on some systems. */ +/* Compensate for bug in Xos.h on some systems, on which it requires + time.h. On some such systems, Xos.h tries to redefine struct + timeval and struct timezone if USG is #defined while it is + #included. */ #ifdef XOS_NEEDS_TIME_H + #include <time.h> +#undef USG +#include <X11/Xos.h> +#define USG #define __TIMEVAL__ -#endif -/* These don't seem to be used. */ -#if 0 -/* Display Context for the icons */ -#include <X11/Intrinsic.h> -#include <X11/StringDefs.h> -#include <X11/Xmu/Drawing.h> -#endif +#else #include <X11/Xos.h> +#endif + /* An explanation of the face data structures. */ |