Mercurial > emacs
changeset 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 | 01941fa99c91 |
| children | 6c88b630141b |
| files | src/config.in src/xfns.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/config.in Sat Jun 12 09:31:25 1993 +0000 +++ b/src/config.in Sat Jun 12 10:12:21 1993 +0000 @@ -97,6 +97,9 @@ #undef const #undef UNEXEC_SRC #undef HAVE_LIBDNET +#undef HAVE_XRMSETDATABASE +#undef HAVE_RANDOM +#undef HAVE_LIBXBSD /* If using GNU, then support inline function declarations. */ #ifdef __GNUC__ @@ -186,6 +189,7 @@ #endif #endif +#if 0 /* This should be taken care of by autoconf now. */ /* joe@zircon.uucp says that in order to use XFree386, you have to link against -lXbsd, which insists on defining the random function. @@ -196,6 +200,7 @@ #define LIBX11_SYSTEM -lXbsd #define HAVE_RANDOM #endif +#endif /* Some of the files of Emacs which are intended for use with other programs assume that if you have a config.h file, you must declare
--- 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;