From b747d3f7535fe324b0ea21d53c4f84970335022a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 10 Jul 2012 22:57:03 -0700 Subject: [PATCH] Assume perror. --- admin/CPP-DEFINES | 1 - admin/ChangeLog | 4 ++-- src/ChangeLog | 5 +++++ src/s/hpux10-20.h | 3 --- src/sysdep.c | 12 ------------ 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 49095d7e3fc..f5522a77ccb 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -134,7 +134,6 @@ HAVE_MENUS HAVE_MKDIR HAVE_MKTIME HAVE_MOUSE -HAVE_PERROR HAVE_PSTAT_GETDYNAMIC HAVE_PWD_H HAVE_RANDOM diff --git a/admin/ChangeLog b/admin/ChangeLog index 60e22eb733a..fd03be5bd8c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,7 +1,7 @@ 2012-07-11 Paul Eggert - Assume strerror. - * CPP-DEFINES (HAVE_STRERROR, strerror): Remove. + Assume perror, strerror. + * CPP-DEFINES (HAVE_PERROR, HAVE_STRERROR, strerror): Remove. 2012-07-10 Dmitry Antipov diff --git a/src/ChangeLog b/src/ChangeLog index d119915643d..749bc12328c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2012-07-11 Paul Eggert + Assume perror. + * s/hpux10-20.h (HAVE_PERROR): Remove. + * sysdep.c (perror) [HPUX && !HAVE_PERROR]: + Remove dummy definition, as this problem was obsolete long ago. + Assume strerror. * sysdep.c (strerror) [!HAVE_STRERROR && !WINDOWSNT]: Remove. diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 0e47ccee86f..7d8222761b3 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -43,9 +43,6 @@ along with GNU Emacs. If not, see . */ /* Special hacks needed to make Emacs run on this system. */ -/* Some additional system facilities exist. */ -#define HAVE_PERROR /* Delete this line for version 6. */ - /* This is how to get the device name of the tty end of a pty. */ #define PTY_TTY_NAME_SPRINTF \ sprintf (pty_name, "/dev/pty/tty%c%x", c, i); diff --git a/src/sysdep.c b/src/sysdep.c index 8a27e24c792..4bbe939dd74 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2023,18 +2023,6 @@ rename (const char *from, const char *to) #endif - -#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. */ - -void -perror (void) -{ -} -#endif /* HPUX and not HAVE_PERROR */ - /* * This function will go away as soon as all the stubs fixed. (fnf) */ -- 2.39.2