[Emacs-diffs] /srv/bzr/emacs/trunk r109056: Do not unconditionally define HAVE_XRMSETDATABASE on some systems

[Glenn Morris]

------------------------------------------------------------
revno: 109056
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 16:53:41 -0400
message:
  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: address@hidden (Rainer Malzbender)
  Subject: Compiling emacs 20.4 on HP-UX 10.20 with gcc
  Date: 2000/02/01
  Newsgroups: gnu.emacs.bug
modified:
  src/ChangeLog
  src/s/gnu-linux.h
  src/s/hpux10-20.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-12 19:55:01 +0000
+++ b/src/ChangeLog     2012-07-12 20:53:41 +0000
@@ -1,3 +1,8 @@
+2012-07-12  Glenn Morris  <address@hidden>
+
+       * s/gnu-linux.h, s/hpux10-20.h:
+       Do not unconditionally define HAVE_XRMSETDATABASE.
+
 2012-07-12  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-07-12 19:48:21 +0000
+++ b/src/s/gnu-linux.h 2012-07-12 20:53:41 +0000
@@ -32,14 +32,6 @@
    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 {                                                         \

=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2012-07-12 07:43:05 +0000
+++ b/src/s/hpux10-20.h 2012-07-12 20:53:41 +0000
@@ -39,12 +39,6 @@
 #undef srandom
 #undef random
 
-/* Rainer Malzbender <address@hidden> 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