aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorPaul Eggert2011-11-13 20:35:22 -0800
committerPaul Eggert2011-11-13 20:35:22 -0800
commitc3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch)
treee707b79a846623490feea39a4dceb86dd218eb4d /src/s
parent6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff)
parent56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff)
downloademacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz
emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip
Merge from trunk.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/hpux10-20.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 98bee64eb08..be457498add 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -89,7 +89,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
89#undef HAVE_RANDOM 89#undef HAVE_RANDOM
90 90
91 91
92/* Rainer Malzbender <rainer@displaytech.com> says definining 92/* Rainer Malzbender <rainer@displaytech.com> says defining
93 HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ 93 HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */
94#ifndef HAVE_XRMSETDATABASE 94#ifndef HAVE_XRMSETDATABASE
95#define HAVE_XRMSETDATABASE 95#define HAVE_XRMSETDATABASE