3 files changed, 5 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d4f7e006fc..f0b532df145 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-12  Glenn Morris  <rgm@gnu.org>
+
+        * s/gnu-linux.h, s/hpux10-20.h:
+        Do not unconditionally define HAVE_XRMSETDATABASE.
+
 2012-07-12  Eli Zaretskii  <eliz@gnu.org>
 
         * 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 90725815dea..569b69f574b 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -32,14 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    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 b9a1d8edab8..00b384f1f3c 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -39,12 +39,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef srandom
 #undef random
 
-/* Rainer Malzbender <rainer@displaytech.com> 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