Commit 788442db authored by Jim Blandy's avatar Jim Blandy
Browse files

* 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.
parent 5e12e32f
......@@ -97,6 +97,9 @@ and this notice must be preserved on all copies. */
#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 @@ and this notice must be preserved on all copies. */
#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 @@ and this notice must be preserved on all copies. */
#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
......
......@@ -3477,7 +3477,7 @@ arg XRM_STRING is a string of resources in xrdb format.")
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment