procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove src/s/hpux10-20.h

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2012-07-30 21:32:19 -04:00
parent b429a4eee4
commit c1529dedfc
5 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-07-31 Glenn Morris <rgm@gnu.org>
* configure.ac (opsysfile): Set to empty on hpux*.
2012-07-30 Glenn Morris <rgm@gnu.org>
* configure.ac (AH_BOTTOM): Use an include file, so that the

3
configure.ac
View file

@ -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)

5
src/ChangeLog
View file

@ -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.

11
src/conf_post.h
View file

@ -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. */

27
src/s/hpux10-20.h
View file

@ -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