summaryrefslogtreecommitdiff
path: root/src/s
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-07-29 11:34:39 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-07-29 11:34:39 -0700
commit1b231651ce7fd7c47a8ed3fbe8f2ca72f8339964 (patch)
tree8e75c67205984c7881c3ecce2139ee0481d4ead5 /src/s
parent2ebf1083e756db91ade4215ce772e37e6c9cb716 (diff)
downloademacs-1b231651ce7fd7c47a8ed3fbe8f2ca72f8339964.tar.gz
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.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/irix6-5.h4
-rw-r--r--src/s/sol2-6.h4
-rw-r--r--src/s/unixware.h4
-rw-r--r--src/s/usg5-4-common.h (renamed from src/s/usg5-4.h)0
4 files changed, 6 insertions, 6 deletions
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