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.

4 files changed, 13 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 19a9ace0728..67905401631 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-13  Glenn Morris  <rgm@gnu.org>
+
+        * s/bsd-common.h (BSD4_3):
+        * s/usg5-4-common.h (USG5_4): No longer define; unused.
+
 2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
 
         * lisp.h (Lisp_Object) [CHECK_LISP_OBJECT_TYPE]: Define as struct
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index ce67dd7b9af..98391740653 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -23,9 +23,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* 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
diff --git a/src/s/template.h b/src/s/template.h
index d8f811dc8aa..e3557aa191b 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -27,7 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #define USG */
 /* #define HPUX */
 /* #define BSD4_2 */
-/* #define BSD4_3 */
 /* #define BSD_SYSTEM */
 
 /* Emacs can read input using SIGIO and buffering characters itself,
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 1502228c0d8..2676e9e5943 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -24,7 +24,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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.  */