Mercurial > emacs
diff src/xfns.c @ 3679:e1380814a454
* config.h.in (HAVE_XRMSETDATABASE, HAVE_RANDOM, HAVE_LIBXBSD):
Add #undefs for these.
Dyke out code requesting -lXbsd and HAVE_RANDOM for XFREE386.
* xfns.c (Fx_open_connection): Test HAVE_XRMSETDATABASE instead of
NO_XRM_SET_DATABASE; the latter isn't used any more.
* m/delta88k, m/tekXD88.h, s/linux.h, s/usg5-4-2.h (HAVE_RANDOM):
Dyke out these #definitions; to avoid conflict with autoconf.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Sat, 12 Jun 1993 10:12:21 +0000 |
parents | 16510ca14405 |
children | 589aaa4a815b |
line wrap: on
line diff
--- a/src/xfns.c Sat Jun 12 09:31:25 1993 +0000 +++ b/src/xfns.c Sat Jun 12 10:12:21 1993 +0000 @@ -3477,7 +3477,7 @@ else xrm_option = (unsigned char *) 0; xrdb = x_load_resources (x_current_display, xrm_option, EMACS_CLASS); -#if defined (HAVE_X11R5) && ! defined (NO_XRM_SET_DATBASE) +#if defined (HAVE_X11R5) || defined (HAVE_XRMSETDATABASE) XrmSetDatabase (x_current_display, xrdb); #else x_current_display->db = xrdb;