-#ifndef __STDC__
-/* Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
- Enable Emacs to compile on it. */
-#include <stddef.h>
-extern size_t strlen (const char *);
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+ That was relevant to code that was here before. */
+#if !defined (__STDC__) || !__STDC__
+/* gcc with -traditional declares the built-in strlen to return int,
+ and has done so at least since version 2.4.5. -- rms. */
+extern int strlen (const char *);