7 files changed, 2 insertions, 18 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index c435687bef1..f3d3c4dd578 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -141,13 +141,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define C_SWITCH_SYSTEM -ma -qmaxmem=4000
 #endif
 
-/* The character-composition stuff is broken in X11R5.
-   Even with XIMStatusNothing aliased to XIMStatusNone,
-   tranle@intellicorp.com (Minh Tran-Le) reports that enabling
-   the internationalization code causes the modifier keys C, M and Shift
-   to beep after a mouse click.  */
-#define X11R5_INHIBIT_I18N
-
 /* string.h defines rindex as a macro, at least with native cc, so we
    lose declaring char * rindex without this.
    It is just a guess which versions of AIX need this definition.  */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 4267da05d4e..1904d71b6c8 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -25,11 +25,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  *      Define all the symbols that apply correctly.
  */
 
-/* #define UNIPLUS */
 /* #define USG5 */
 #define USG
 /* #define BSD_SYSTEM */
-#define LINUX
 #define GNU_LINUX
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 857bf70a9cc..811a682f74c 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -27,8 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef SYSTEM_TYPE
 #define SYSTEM_TYPE "gnu"
 
-#undef NLIST_STRUCT
-
 /* XXX should getloadavg be in libc?  Should we have a libutil?
 #define HAVE_GETLOADAVG */
 #undef NLIST_STRUCT
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index f617490bef2..104f55f9037 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -296,7 +296,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_NTGUI
 #define HAVE_WINDOW_SYSTEM 1
-#define HAVE_FACES 1
 #define HAVE_MENUS 1
 #endif
 
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 73e62ecad6c..43e87bedd30 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -241,9 +241,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 /* We canuse mouse menus.  */
 #define HAVE_MENUS
 
-/* We have support for faces.  */
-#define HAVE_FACES
-
 /* Define one of these for easier conditionals.  */
 #ifdef HAVE_X_WINDOWS
 /* We need a little extra space, see ../../lisp/loadup.el */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 2dac039c43b..4cc8bed90be 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -50,8 +50,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  */
 
 /* Some versions of V.3 have this, but not all.
-   #define HAVE_PTYS
-   #define SYSV_PTYS  */
+   #define HAVE_PTYS  */
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 
diff --git a/src/s/vms.h b/src/s/vms.h
index 413c302e8c7..6e269e61a0d 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -149,7 +149,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define rindex strrchr
 #define unlink delete
 
-#ifndef _GNUC_
+#ifndef __GNUC__
 extern double mth$dmod(double, double);
 #endif