(wait_for_termination): Copy code from 18.59 (but sans BSD4_1 alternatives).

[gnu-emacs] / src / xrdb.c

diff --git a/src/xrdb.c b/src/xrdb.c
index a722780f60d2a2a26ae5b92efb5bc855ac475ecb..a83cb37fe53e9c9ef9cd530b74237a08a117bfd8 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -29,7 +29,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #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 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <X11/X.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
-#include <sys/param.h>
 #ifdef VMS
 #include "vms-pwd.h"
 #else
@@ -51,9 +54,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 
 extern char *getenv ();
+
+/* This does cause trouble on AIX.  I'm going to take the comment at
+   face value.  */
+#if 0
 extern short getuid ();                /* If this causes portability problems,
                                   I think we should just delete it; it'll
                                   default to `int' anyway.  */
+#endif
+
 extern struct passwd *getpwuid ();
 extern struct passwd *getpwnam ();
 
@@ -283,7 +292,7 @@ get_user_db (display)
   XrmDatabase db;
   char *xdefs;
 
-#ifdef HAVE_X11R4
+#ifdef PBaseSize               /* Cheap way to test for X11R4 or later.  */
   xdefs = XResourceManagerString (display);
 #else
   xdefs = display->xdefaults;