From a7208036ed514ead06b0e95bdcdb306adb91e0df Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 12 Jul 2012 16:53:41 -0400 Subject: [PATCH] Do not unconditionally define HAVE_XRMSETDATABASE on some systems * src/s/gnu-linux.h, src/s/hpux10-20.h: Do not unconditionally define HAVE_XRMSETDATABASE. Maybe there was a time when this made sense, but in the current tree it is totally illogical. This is only used in xterm.c. If it is set we call XrmSetDatabase, if not we do something else. Configure tests for XrmSetDatabase and sets HAVE_XRMSETDATABASE accordingly. The only possibility that is not totally nonsensical is that the system does in fact have XrmSetDatabase but configure failed to find it (I don't see how this could happen though...); in which case we should fix the configure test rather than force the results. But this is not what the (vague) comments say was happending. The gnu-linux piece dates from 1995, the hpux one from 2000. https://groups.google.com/forum/?fromgroups#!topic/gnu.emacs.bug/H24wEM8Vp9A From: rainer@displaytech.com (Rainer Malzbender) Subject: Compiling emacs 20.4 on HP-UX 10.20 with gcc Date: 2000/02/01 Newsgroups: gnu.emacs.bug --- src/ChangeLog | 5 +++++ src/s/gnu-linux.h | 8 -------- src/s/hpux10-20.h | 6 ------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4d4f7e006f..f0b532df14 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-12 Glenn Morris + + * s/gnu-linux.h, s/hpux10-20.h: + Do not unconditionally define HAVE_XRMSETDATABASE. + 2012-07-12 Eli Zaretskii * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 90725815de..569b69f574 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -32,14 +32,6 @@ along with GNU Emacs. If not, see . */ your system and must be used only through an encapsulation (Which you should place, by convention, in sysdep.c). */ - -/* This is to work around mysterious gcc failures in some system versions. - It is unlikely that Emacs changes will work around this problem; - therefore, this should remain permanently. */ -#ifndef HAVE_XRMSETDATABASE -#define HAVE_XRMSETDATABASE -#endif - #ifdef __ia64__ #define GC_MARK_SECONDARY_STACK() \ do { \ diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index b9a1d8edab..00b384f1f3 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -39,12 +39,6 @@ along with GNU Emacs. If not, see . */ #undef srandom #undef random -/* Rainer Malzbender says defining - HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ -#ifndef HAVE_XRMSETDATABASE -#define HAVE_XRMSETDATABASE -#endif - /* Conservative garbage collection has not been tested, so for now play it safe and stick with the old-fashioned way of marking. */ #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE -- 2.39.2