Mercurial > emacs
changeset 3997:d968bcba16af
* 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.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Mon, 05 Jul 1993 09:31:36 +0000 |
| parents | b9bdcf862c67 |
| children | c0560357c84e |
| files | src/xfaces.c |
| diffstat | 1 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Mon Jul 05 08:13:50 1993 +0000 +++ b/src/xfaces.c Mon Jul 05 09:31:36 1993 +0000 @@ -34,22 +34,24 @@ #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> -#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 +#include <time.h> +#undef USG +#include <X11/Xos.h> +#define USG +#define __TIMEVAL__ + +#else #include <X11/Xos.h> +#endif + /* An explanation of the face data structures. */