Mercurial > emacs

diff src/sysdep.c @ 97141:840bd675fd85 before-remove-vms

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* s/ms-w32.h (MULTI_KBOARD): Remove. * xterm.c: * xselect.c: * xfns.c: * window.c: * w32term.c: * w32fns.c: * terminal.c: * termhooks.h: * term.c: * sysdep.c: * keyboard.h: * keyboard.c: * frame.h: * frame.c: * frame.c: Remove references to MULTI_KBOARD, it is now the default. * config.in: Regenerate. * config.nt (MULTI_KBOARD): Remove. * configure.in (MULTI_KBOARD): Remove.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 31 Jul 2008 02:47:32 +0000
parents b57392641da7
children c3512b2085a0
line wrap: on
line diff
--- a/src/sysdep.c	Thu Jul 31 01:37:35 2008 +0000
+++ b/src/sysdep.c	Thu Jul 31 02:47:32 2008 +0000
@@ -3176,8 +3176,7 @@
 #endif
 
 
-#ifdef HPUX
-#ifndef HAVE_PERROR
+#if defined(HPUX) && !defined(HAVE_PERROR)
 
 /* HPUX curses library references perror, but as far as we know
    it won't be called.  Anyway this definition will do for now.  */
@@ -3185,9 +3184,7 @@
 perror ()
 {
 }
-
-#endif /* not HAVE_PERROR */
-#endif /* HPUX */
+#endif /* HPUX and not HAVE_PERROR */
 
 #ifndef HAVE_DUP2