X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/54c908b57c8dd89b90d6a650724df0d2f0224071..42e3337cc7a782ab8705b1dea3841a7b0dcb6224:/src/xrdb.c

diff --git a/src/xrdb.c b/src/xrdb.c
index f241a079c4..a83cb37fe5 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -54,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 ();
 
@@ -286,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;