3 files changed, 16 insertions, 27 deletions

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  <rgm@gnu.org>
+
+        * 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  <rgm@gnu.org>
 
         * 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 <http://www.gnu.org/licenses/>.  */
 #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 <http://www.gnu.org/licenses/>.  */
-
-/* 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