From: Glenn Morris Date: Wed, 1 Aug 2012 15:25:43 +0000 (-0700) Subject: Alphabetical order X-Git-Tag: emacs-24.2.90~920 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aac1c9ac836a116dfae721b6eeff30b5c018ab22;p=emacs.git Alphabetical order --- diff --git a/src/conf_post.h b/src/conf_post.h index 5c06c3f4482..0870c17487b 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -74,6 +74,22 @@ along with GNU Emacs. If not, see . */ #define vfork fork #endif /* DARWIN_OS */ +/* 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. */ +#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 /* HPUX */ + #ifdef MSDOS #ifndef __DJGPP__ You lose; /* Emacs for DOS must be compiled with DJGPP */ @@ -114,22 +130,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #endif #endif /* MSDOS */ -/* 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. */ -#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 #ifdef emacs char *_getpty();