Mercurial > emacs
changeset 1389:517c3893ec5b
* xterm.c, xrdb.c: #include <stdio.h> before "xterm.h", to avoid
warnings about redefining NULL under GCC 2.2.2.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sun, 11 Oct 1992 06:44:42 +0000 |
| parents | 02226bff1476 |
| children | 92df75f4167f |
| files | src/xrdb.c src/xterm.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xrdb.c Sun Oct 11 06:43:30 1992 +0000 +++ b/src/xrdb.c Sun Oct 11 06:44:42 1992 +0000 @@ -29,7 +29,11 @@ #endif /* USG5 */ #endif /* 1 */ - + +/* This should be included before the X include files; otherwise, we get + warnings about redefining NULL under BSD 4.3. */ +#include <sys/param.h> + #include <X11/Xlib.h> #include <X11/Xatom.h> #if 0 @@ -38,7 +42,6 @@ #include <X11/X.h> #include <X11/Xutil.h> #include <X11/Xresource.h> -#include <sys/param.h> #ifdef VMS #include "vms-pwd.h" #else
--- a/src/xterm.c Sun Oct 11 06:43:30 1992 +0000 +++ b/src/xterm.c Sun Oct 11 06:44:42 1992 +0000 @@ -31,7 +31,8 @@ #include "lisp.h" -/* On 4.3 this loses if it comes after xterm.h. */ +/* On 4.3 these lose if they come after xterm.h. */ +#include <stdio.h> #include <signal.h> /* This may include sys/types.h, and that somehow loses @@ -70,7 +71,6 @@ #include "systime.h" #include <fcntl.h> -#include <stdio.h> #include <ctype.h> #include <errno.h> #include <setjmp.h>