[Emacs-diffs] /srv/bzr/emacs/trunk r108603: Remove some unused definitions from src/s

[Glenn Morris]

------------------------------------------------------------
revno: 108603
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-13 14:11:05 -0400
message:
  Remove some unused definitions from src/s
  
  * src/s/bsd-common.h (BSD4_3):
  * src/s/usg5-4-common.h (USG5_4): No longer define; unused.
  
  * admin/CPP-DEFINES, src/s/template.h: Related edits.
modified:
  admin/CPP-DEFINES
  src/ChangeLog
  src/s/bsd-common.h
  src/s/template.h
  src/s/usg5-4-common.h

=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2012-06-13 13:40:48 +0000
+++ b/admin/CPP-DEFINES 2012-06-13 18:11:05 +0000
@@ -79,7 +79,6 @@
 BROKEN_SIGPOLL
 BROKEN_SIGPTY
 BSD4_2
-BSD4_3
 BSD_SYSTEM
 CLASH_DETECTION
 DATA_SEG_BITS
@@ -238,7 +237,6 @@
 USE_TOOLKIT_SCROLL_BARS
 USG
 USG5
-USG5_4
 USG_SUBTTY_WORKS
 VALBITS
 WRETCODE

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-13 13:40:48 +0000
+++ b/src/ChangeLog     2012-06-13 18:11:05 +0000
@@ -1,3 +1,8 @@
+2012-06-13  Glenn Morris  <address@hidden>
+
+       * s/bsd-common.h (BSD4_3):
+       * s/usg5-4-common.h (USG5_4): No longer define; unused.
+
 2012-06-13  Andreas Schwab  <address@hidden>
 
        * lisp.h (Lisp_Object) [CHECK_LISP_OBJECT_TYPE]: Define as struct

=== modified file 'src/s/bsd-common.h'
--- a/src/s/bsd-common.h        2012-06-12 17:43:09 +0000
+++ b/src/s/bsd-common.h        2012-06-13 18:11:05 +0000
@@ -23,9 +23,12 @@
 
 /* We give these symbols the numeric values found in <sys/param.h> to
    avoid warnings about redefined macros.  */
-#ifndef BSD4_3
-#define BSD4_3 1
-#endif /* BSD4_3 */
+
+/* Nothing in Emacs uses this any more.
+   ifndef BSD4_3
+   define BSD4_3 1
+   endif
+*/
 
 #ifndef BSD_SYSTEM
 #define BSD_SYSTEM 43

=== modified file 'src/s/template.h'
--- a/src/s/template.h  2012-06-11 23:17:11 +0000
+++ b/src/s/template.h  2012-06-13 18:11:05 +0000
@@ -27,7 +27,6 @@
 /* #define USG */
 /* #define HPUX */
 /* #define BSD4_2 */
-/* #define BSD4_3 */
 /* #define BSD_SYSTEM */
 
 /* Emacs can read input using SIGIO and buffering characters itself,

=== modified file 'src/s/usg5-4-common.h'
--- a/src/s/usg5-4-common.h     2012-06-13 02:39:20 +0000
+++ b/src/s/usg5-4-common.h     2012-06-13 18:11:05 +0000
@@ -24,7 +24,8 @@
 #define USG                            /* System III, System V, etc */
 
 #define USG5
-#define USG5_4
+/* Nothing in Emacs use this any more.  */
+/* #define USG5_4 */
 
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */