[Emacs-diffs] /srv/bzr/emacs/trunk r109335: * src/conf_post.h [HPUX]: Undefine HAVE_RANDOM and HAVE_RINT.

[Glenn Morris]

------------------------------------------------------------
revno: 109335
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-31 14:34:26 -0400
message:
  * src/conf_post.h [HPUX]: Undefine HAVE_RANDOM and HAVE_RINT.
  This is a belt-and-braces approach.
  
  * configure.ac: Related comment.
modified:
  configure.ac
  src/ChangeLog
  src/conf_post.h

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-31 17:50:52 +0000
+++ b/configure.ac      2012-07-31 18:34:26 +0000
@@ -2725,7 +2725,6 @@
   AC_CHECK_FUNCS(getwd)
 fi
 
-dnl FIXME Fragile: see above.
 ## Eric Backus <address@hidden> says, HP-UX 9.x on HP 700 machines
 ## has a broken `rint' in some library versions including math library
 ## version number A.09.05.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-31 17:50:52 +0000
+++ b/src/ChangeLog     2012-07-31 18:34:26 +0000
@@ -1,5 +1,7 @@
 2012-07-31  Glenn Morris  <address@hidden>
 
+       * conf_post.h [HPUX]: Undefine HAVE_RANDOM and HAVE_RINT.
+
        * conf_post.h (AMPERSAND_FULL_NAME, subprocesses):
        Move to configure.ac.
 

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2012-07-31 17:50:52 +0000
+++ b/src/conf_post.h   2012-07-31 18:34:26 +0000
@@ -71,11 +71,16 @@
    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.  */
+   So we go with HAVE_LRAND48 being defined.  */
 #ifdef HPUX
 #undef srandom
 #undef random
+/* We try to avoid checking for random and rint on hpux in
+   configure.ac, but some other configure test might check for them as
+   a dependency, so to be safe we also undefine them here.
+ */
+#undef HAVE_RANDOM
+#undef HAVE_RINT
 #endif
 
 #ifdef IRIX6_5