import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

[chise/xemacs-chise.git.1] / src / s / decosf4-0.h

diff --git a/src/s/decosf4-0.h b/src/s/decosf4-0.h
index bd0fee8..245b01e 100644 (file)
--- a/src/s/decosf4-0.h
+++ b/src/s/decosf4-0.h
@@ -2,9 +2,15 @@
 
 #include "decosf3-2.h"
 
+/* etext and edata are only available when compiling in non-ANSI mode,
+   while _etext and _edata are always available, hence more portable.
+   This allows `configure --compiler=cc --cflags=-std1' to work. */
+#define etext _etext
+#define edata _edata
+
 #ifndef NOT_C_CODE
-#include "/usr/include/sys/lc_core.h"
-#include "/usr/include/reg_types.h"
+#include "sys/lc_core.h"
+#include "reg_types.h"
 #endif /* C code */
 
 #define re_compile_pattern sys_re_compile_pattern
@@ -24,13 +30,12 @@
 #define regoff_t sys_regoff_t
 #define regmatch_t sys_regmatch_t
 
-/* A perfectly ordinary link wins again - martin 
 #undef C_SWITCH_SYSTEM
 #undef LIBS_SYSTEM
 #undef LIBS_DEBUG
-#define ORDINARY_LINK */
+/* #define ORDINARY_LINK */
 
-/*#define SYSTEM_MALLOC*/
+#undef SYSTEM_MALLOC
 
 #if 0 /* martin */
 /* Some V4.0* versions before V4.0B don't detect rename properly. */