#include "sol2-4.h"
-#undef GETTIMEOFDAY_ONE_ARGUMENT
+#if 0 /* Klaus Zeitler <kzeitler@lucent.com> says SIGIO still fails. */
+#undef BROKEN_SIGIO
+#endif
+
+/* -lgen is needed for the regex and regcmp functions
+ which are used by Motif. In the future we can try changing
+ regex.c to provide them in Emacs, but this is safer for now. */
+#define LIB_MOTIF -lXm -lgen
+
+/* This is the only known way to avoid some crashes
+ that seem to relate to screwed up malloc data
+ after deleting a frame. */
+/* rms: I think the problems using ralloc had to do with system
+ libraries that called the system malloc even if we linked in the
+ GNU malloc. I could not see any way to fix the problem except to
+ have just one malloc and that had to be the system one. */
+/* This is not always necessary. Turned off at present for testers to
+ identify any problems with gmalloc more accurately. */
+/* #define SYSTEM_MALLOC */
+
+/* There have problems reported with mmap at least on Solaris 2.6
+ and 2.7. For simplicity, let's not use mmap for anything >= 2.5.
+ We can optimize this later. */
+
+#undef USE_MMAP_FOR_BUFFERS
+
+/* Probably OK also on earlier versions. */
+#define GC_SETJMP_WORKS 1
+#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
+
+/* arch-tag: 96d65526-21c9-4547-a797-2bd575c05be7
+ (do not change this comment) */