diff options
author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-31 02:47:32 +0000 |
---|---|---|
committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-31 02:47:32 +0000 |
commit | 12205281da02dc955c47fa1830bbd4daef835433 (patch) | |
tree | 1496b27a15674de3998143ee86c890e777b78c8f /src/sysdep.c | |
parent | b41d4794f126c98d4f0a3a6921a611b022e5f33f (diff) | |
download | emacs-before-remove-vms.tar.gz |
* s/ms-w32.h (MULTI_KBOARD): Remove.before-remove-vms
* 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.
Diffstat (limited to 'src/sysdep.c')
-rw-r--r-- | src/sysdep.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 6e0107dfe3f..908375d344d 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -3176,8 +3176,7 @@ rename (from, to) #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 @@ rename (from, to) perror () { } - -#endif /* not HAVE_PERROR */ -#endif /* HPUX */ +#endif /* HPUX and not HAVE_PERROR */ #ifndef HAVE_DUP2 |