1 files changed, 6 insertions, 0 deletions

diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 893d62ba7a7..c361d28f941 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -109,3 +109,9 @@ Boston, MA 02111-1307, USA.  */
 #define TEXT_END get_etext ()
 /* This seems to be right for end_of_data, but it may not be used anyway.  */
 #define DATA_END get_edata ()
+
+/* Don't include string.h--it causes trouble.  */
+#undef HAVE_STRING_H
+
+/* Tell emacs.c not to define abort.  */
+#define NO_ABORT