Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not unconditionally define HAVE_XRMSETDATABASE on some systems

Browse source 
* 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
This commit is contained in:
Glenn Morris 2012-07-12 16:53:41 -04:00
parent 5a97981785
commit a7208036ed
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

8
src/s/gnu-linux.h
View file

@ -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 { \

6
src/s/hpux10-20.h
View file

@ -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