merge with 1.9.4d

diff --git a/lib/getopt.c b/lib/getopt.c
index 0520ea6e0e58b6796b1f9a6c6b529fe597047bb2..812258ae3d73a4bbafbc0c8a7e2e00ab29c84ff9 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -191,13 +191,9 @@ my_index (str, chr)
    If not using GCC, it is ok not to declare it.  */
 #ifdef __GNUC__
 #ifndef __STDC__
-#ifdef IN_GCC
-#include "gstddef.h"
-#else /* not IN_GCC */
 /* Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
    Enable Emacs to compile on it.  */
 #include <stddef.h>
-#endif /* not IN_GCC */
 extern size_t strlen (const char *);
 #endif /* not __STDC__ */
 #endif /* __GNUC__ */