Commit 7552f3ee authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 14c114ae
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>
......
......@@ -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.])
......
......@@ -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.
......
......@@ -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. */
......
/* 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 */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment