[Emacs-diffs] /srv/bzr/emacs/trunk r100942: Rename s/usg5-4.h -> s/usg5-4-common.h.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100942
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-29 11:34:39 -0700
message:
  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.
renamed:
  src/s/usg5-4.h => src/s/usg5-4-common.h
modified:
  src/ChangeLog
  src/s/irix6-5.h
  src/s/sol2-6.h
  src/s/unixware.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-29 18:08:51 +0000
+++ b/src/ChangeLog     2010-07-29 18:34:39 +0000
@@ -1,3 +1,12 @@
+2010-07-29  Dan Nicolaescu  <address@hidden>
+
+       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  <address@hidden>
 
        * xfns.c (x_set_tool_bar_position): Remove debug fprintf.

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2010-06-30 02:48:54 +0000
+++ b/src/s/irix6-5.h   2010-07-29 18:34:39 +0000
@@ -20,7 +20,7 @@
 
 
 #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 @@
 
 #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

=== modified file 'src/s/sol2-6.h'
--- a/src/s/sol2-6.h    2010-06-30 03:43:30 +0000
+++ b/src/s/sol2-6.h    2010-07-29 18:34:39 +0000
@@ -18,7 +18,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"
 
 #define SOLARIS2
 
@@ -34,7 +34,7 @@
 #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.   address@hidden */

=== modified file 'src/s/unixware.h'
--- a/src/s/unixware.h  2010-05-12 06:53:03 +0000
+++ b/src/s/unixware.h  2010-07-29 18:34:39 +0000
@@ -19,7 +19,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "usg5-4.h"
+#include "usg5-4-common.h"
 
 /* address@hidden says these exist.  */
 #define HAVE_TCATTR
@@ -28,7 +28,7 @@
 
 #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.   address@hidden */

=== renamed file 'src/s/usg5-4.h' => 'src/s/usg5-4-common.h'