#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 ();
XrmDatabase db;
char *xdefs;
-#ifdef HAVE_X11R4
+#ifdef PBaseSize /* Cheap way to test for X11R4 or later. */
xdefs = XResourceManagerString (display);
#else
xdefs = display->xdefaults;