diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-07-30 23:19:40 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-07-30 23:19:40 -0700 |
| commit | 7552f3ee025f0741d5cfe7ed6c9b91699f372f48 (patch) | |
| tree | 7fa80d2d5b113dbdf6dad5a12611e835561ae2d2 | |
| parent | 14c114ae549b8f682e8513f1379b671cd15b01ae (diff) | |
Remove src/s/irix6-5.h
* configure.ac (opsysfile): Set to s/usg5-4-common.h on irix6-5.
* src/conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here.
* src/s/irix6-5.h: Remove file.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/conf_post.h | 8 | ||||
| -rw-r--r-- | src/s/irix6-5.h | 26 |
5 files changed, 14 insertions, 27 deletions
@@ -1,6 +1,7 @@ 2012-07-31 Glenn Morris <rgm@gnu.org> - * configure.ac (opsysfile): Set to empty on hpux*, darwin. + * configure.ac (opsysfile): Set to empty on hpux*, darwin; + and to s/usg5-4-common.h on irix6-5. 2012-07-30 Glenn Morris <rgm@gnu.org> diff --git a/configure.ac b/configure.ac index 83b3fec1d0..fd68e93beb 100644 --- a/configure.ac +++ b/configure.ac @@ -3731,6 +3731,7 @@ case $opsys in ;; irix6-5) + opsysfile="s/usg5-4-common.h" AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.]) diff --git a/src/ChangeLog b/src/ChangeLog index 37e3bf6189..cd14672820 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,6 +8,9 @@ 2012-07-31 Glenn Morris <rgm@gnu.org> + * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here. + * s/irix6-5.h: Remove file. + * conf_post.h [DARWIN_OS]: Move remaining contents of s/darwin.h here. * s/darwin.h: Remove file. diff --git a/src/conf_post.h b/src/conf_post.h index 98f51f22fe..32fdc899da 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -78,6 +78,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef random #endif +#ifdef IRIX6_5 +#ifdef emacs +char *_getpty(); +#endif + +#undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ +#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/irix6-5.h b/src/s/irix6-5.h deleted file mode 100644 index 338c18cca5..0000000000 --- a/src/s/irix6-5.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.5. - -Copyright (C) 1999-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/>. */ - -#include "usg5-4-common.h" - -#ifdef emacs -char *_getpty(); -#endif - -#undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ |