Rename s/usg5-4.h -> s/usg5-4-common.h.

* s/usg5-4.h: Rename file to ...
* src/s/usg5-4-common.h: ... this for consistency with what we do for BSD.
* src/s/unixware.h:
* src/s/sol2-6.h:
* src/s/irix6-5.h: Update includes accordingly.

5 files changed, 15 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2eb15cc0d13..a3f0384194a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Rename s/usg5-4.h -> s/usg5-4-common.h.
+        * s/usg5-4.h: Rename file to ...
+        * s/usg5-4-common.h: ... this for consistency with what we do for BSD.
+        * s/unixware.h:
+        * s/sol2-6.h:
+        * s/irix6-5.h: Update includes accordingly.
+
 2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xfns.c (x_set_tool_bar_position): Remove debug fprintf.
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index e2b18b2ec2b..10481f609c3 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -20,7 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #define IRIX6_5                 /* used in m/iris4d */
-#include "usg5-4.h"
+#include "usg5-4-common.h"
 
 #undef _longjmp /* use system versions, not conservative aliases */
 #undef _setjmp
@@ -91,7 +91,7 @@ char *_getpty();
 
 #undef SA_RESTART
 
-#undef TIOCSIGSEND              /* defined in usg5-4.h */
+#undef TIOCSIGSEND              /* defined in usg5-4-common.h */
 
 /* Tested on Irix 6.5.  SCM worked on earlier versions.  */
 #define GC_SETJMP_WORKS 1
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index f4719093d4a..3b707aa5c3c 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -18,7 +18,7 @@ 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.h"
+#include "usg5-4-common.h"
 
 #define SOLARIS2
 
@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_LIBKSTAT
 #endif
 
-/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
+/* This is the same definition as in usg5-4-common.h, but with sigblock/sigunblock
    rather than sighold/sigrelse, which appear to be BSD4.1 specific.
    It may also be appropriate for SVR4.x
    (x<2) but I'm not sure.   fnf@cygnus.com */
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 864f09786b6..ac989d48e2c 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -19,7 +19,7 @@ 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.h"
+#include "usg5-4-common.h"
 
 /* fnf@cygnus.com says these exist.  */
 #define HAVE_TCATTR
@@ -28,7 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #undef HAVE_SYSV_SIGPAUSE
 
-/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
+/* This is the same definition as in usg5-4-common.h, but with sigblock/sigunblock
    rather than sighold/sigrelse, which appear to be BSD4.1 specific.
    It may also be appropriate for SVR4.x
    (x<2) but I'm not sure.   fnf@cygnus.com */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4-common.h
index 0fcc6623450..0fcc6623450 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4-common.h