[Emacs-diffs] /srv/bzr/emacs/trunk r109315: Remove src/s/usg5-4-common.h

[Glenn Morris]

------------------------------------------------------------
revno: 109315
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-30 23:43:37 -0700
message:
  Remove src/s/usg5-4-common.h
  
  * configure.ac (USG5_4): Reintroduce this.
  (opsysfile): Set to empty on irix6-5, sol2*, and unixware.
  
  * src/conf_post.h [USG5_4]: Move remaining contents of s/usg5-4-common.h here.
  * src/s/usg5-4-common.h: Remove file.
removed:
  src/s/usg5-4-common.h
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/conf_post.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-31 06:35:08 +0000
+++ b/ChangeLog 2012-07-31 06:43:37 +0000
@@ -1,5 +1,8 @@
 2012-07-31  Glenn Morris  <address@hidden>
 
+       * configure.ac (USG5_4): Reintroduce this.
+       (opsysfile): Set to empty on irix6-5, sol2*, and unixware.
+
        * configure.ac (wait3, WRETCODE): Move here from src/s/usg5-4-common.h.
 
        * configure.ac (opsysfile): Set to empty on hpux*, darwin;

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-31 06:35:08 +0000
+++ b/configure.ac      2012-07-31 06:43:37 +0000
@@ -3685,6 +3685,7 @@
 AH_TEMPLATE(BSD_SYSTEM, [Define if the system is compatible with BSD 4.2.])
 AH_TEMPLATE(USG, [Define if the system is compatible with System III.])
 AH_TEMPLATE(USG5, [Define if the system is compatible with System V.])
+AH_TEMPLATE(USG5_4, [Define if the system is compatible with System V Release 
4.])
 
 case $opsys in
   aix4-2)
@@ -3748,23 +3749,26 @@
     ;;
 
   irix6-5)
-    opsysfile="s/usg5-4-common.h"
+    opsysfile=
     AC_DEFINE(USG, [])
     AC_DEFINE(USG5, [])
+    AC_DEFINE(USG5_4, [])
     AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.])
     ;;
 
   sol2*)
-    opsysfile="s/usg5-4-common.h"
+    opsysfile=
     AC_DEFINE(USG, [])
     AC_DEFINE(USG5, [])
+    AC_DEFINE(USG5_4, [])
     AC_DEFINE(SOLARIS2, [], [Define if the system is Solaris.])
     ;;
 
   unixware)
-    opsysfile="s/usg5-4-common.h"
+    opsysfile=
     AC_DEFINE(USG, [])
     AC_DEFINE(USG5, [])
+    AC_DEFINE(USG5_4, [])
     ;;
 esac
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-31 06:35:08 +0000
+++ b/src/ChangeLog     2012-07-31 06:43:37 +0000
@@ -10,6 +10,10 @@
 
        * s/usg5-4-common.h (wait3, WRETCODE): Let configure set them.
 
+       * conf_post.h [USG5_4]:
+       Move remaining contents of s/usg5-4-common.h here.
+       * s/usg5-4-common.h: Remove file.
+
        * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here.
        * s/irix6-5.h: Remove file.
 

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2012-07-31 06:19:40 +0000
+++ b/src/conf_post.h   2012-07-31 06:43:37 +0000
@@ -84,7 +84,23 @@
 #endif
 
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
+#endif /* IRIX6_5 */
+
+#ifdef USG5_4
+/* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
+   But get <termio.h> first to make sure ttold.h doesn't interfere.  */
+#include <sys/wait.h>
+
+#ifdef emacs
+#include <sys/filio.h>
+#include <termio.h>
+#include <sys/ttold.h>
+#include <signal.h>
+#include <sys/stream.h>
+#include <sys/stropts.h>
+#include <sys/termios.h>
 #endif
+#endif  /* USG5_4 */
 
 /* Define AMPERSAND_FULL_NAME if you use the convention
    that & in the full name stands for the login id.  */

=== removed file 'src/s/usg5-4-common.h'
--- a/src/s/usg5-4-common.h     2012-07-31 06:35:08 +0000
+++ b/src/s/usg5-4-common.h     1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/* Definitions file for GNU Emacs running on AT&T's System V Release 4
-
-Copyright (C) 1987, 1990, 1999-2012  Free Software Foundation, Inc.
-
-Written by James Van Artsdalen of Dell Computer Corp. address@hidden
-Subsequently improved for Dell 2.2 by Eric S. Raymond <address@hidden>.
-
-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/>.  */
-
-/* Get FIONREAD from <sys/filio.h>.  Get <sys/ttold.h> to get struct tchars.
-   But get <termio.h> first to make sure ttold.h doesn't interfere.  */
-#include <sys/wait.h>
-
-#ifdef emacs
-#include <sys/filio.h>
-#include <termio.h>
-#include <sys/ttold.h>
-#include <signal.h>
-#include <sys/stream.h>
-#include <sys/stropts.h>
-#include <sys/termios.h>
-#endif