From c1529dedfc3df43bfa794c69076da9fff05808a5 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 30 Jul 2012 21:32:19 -0400 Subject: [PATCH] Remove src/s/hpux10-20.h * configure.ac (opsysfile): Set to empty on hpux*. * src/conf_post.h [HPUX]: Move random, srandom here from s/hpux10-20.h. * src/s/hpux10-20.h: Remove file, which is now empty. --- ChangeLog | 4 ++++ configure.ac | 3 +-- src/ChangeLog | 5 +++++ src/conf_post.h | 11 +++++++++++ src/s/hpux10-20.h | 27 --------------------------- 5 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 src/s/hpux10-20.h diff --git a/ChangeLog b/ChangeLog index b0860362b1c..5eb06140c76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-07-31 Glenn Morris + + * configure.ac (opsysfile): Set to empty on hpux*. + 2012-07-30 Glenn Morris * configure.ac (AH_BOTTOM): Use an include file, so that the diff --git a/configure.ac b/configure.ac index 402524f436d..f11a6c4cec6 100644 --- a/configure.ac +++ b/configure.ac @@ -3723,6 +3723,7 @@ case $opsys in ;; hpux*) + opsysfile= AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(HPUX, [], [Define if the system is HPUX.]) @@ -3773,8 +3774,6 @@ case $opsys in AC_DEFINE(USG_SUBTTY_WORKS, 1, [Define for USG systems where it works to open a pty's tty in the parent process, then close and reopen it in the child.]) - - opsysfile="s/hpux10-20.h" ;; irix6-5) diff --git a/src/ChangeLog b/src/ChangeLog index f3e8b58e071..baf73fb870c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-31 Glenn Morris + + * conf_post.h [HPUX]: Move random, srandom here from s/hpux10-20.h. + * s/hpux10-20.h: Remove file, which is now empty. + 2012-07-30 Glenn Morris * conf_post.h: New, split from configure.ac's AH_BOTTOM. diff --git a/src/conf_post.h b/src/conf_post.h index 5efecfb8c05..d81763b1a73 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -51,6 +51,17 @@ along with GNU Emacs. If not, see . */ #endif #endif +/* We have to go this route, rather than the old hpux9 approach of + renaming the functions via macros. The system's stdlib.h has fully + prototyped declarations, which yields a conflicting definition of + srand48; it tries to redeclare what was once srandom to be srand48. + So we go with HAVE_LRAND48 being defined. Note we also undef + HAVE_RANDOM via configure. */ +#ifdef HPUX +#undef srandom +#undef random +#endif + /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ /* Turned on June 1996 supposing nobody will mind it. */ diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h deleted file mode 100644 index 94b46a715ea..00000000000 --- a/src/s/hpux10-20.h +++ /dev/null @@ -1,27 +0,0 @@ -/* System description file for hpux version 10.20. - -Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -/* We have to go this route, rather than hpux9's approach of renaming the - functions via macros. The system's stdlib.h has fully prototyped - declarations, which yields a conflicting definition of srand48; it - tries to redeclare what was once srandom to be srand48. So we go - with HAVE_LRAND48 being defined. - Note we also undef HAVE_RANDOM via configure. */ -#undef srandom -#undef random -- 2.39.2