projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.4.12 "Portable Code".
[chise/xemacs-chise.git]
/
src
/
config.h.in
diff --git
a/src/config.h.in
b/src/config.h.in
index
81d0e55
..
3a10221
100644
(file)
--- a/
src/config.h.in
+++ b/
src/config.h.in
@@
-32,11
+32,18
@@
Boston, MA 02111-1307, USA. */
#undef HAVE_ALLOCA_H
#ifndef NOT_C_CODE
#undef HAVE_ALLOCA_H
#ifndef NOT_C_CODE
-#ifdef __GNUC__
+#if defined (__CYGWIN__)
+/* We get complaints about redefinitions if we just use the __GNUC__
+ definition: stdlib.h also includes alloca.h, which defines it slightly
+ differently */
+#include <alloca.h>
+#elif defined (__GNUC__)
#define alloca __builtin_alloca
#elif defined __DECC
#include <alloca.h>
#pragma intrinsic(alloca)
#define alloca __builtin_alloca
#elif defined __DECC
#include <alloca.h>
#pragma intrinsic(alloca)
+#elif defined __INTEL_COMPILER && defined HAVE_ALLOCA_H
+/* defer #include to end of file */
#elif defined HAVE_ALLOCA_H
#include <alloca.h>
#elif defined(_AIX)
#elif defined HAVE_ALLOCA_H
#include <alloca.h>
#elif defined(_AIX)
@@
-165,8
+172,16
@@
void *alloca ();
#endif
#endif /* HAVE_X_WINDOWS */
#endif
#endif /* HAVE_X_WINDOWS */
+/* Defines for building Gtk applications */
+#undef HAVE_GNOME
+#undef HAVE_GTK
+#undef HAVE_GDK_IMLIB_INIT
+#undef HAVE_GLADE_GLADE_H
+#undef HAVE_GLADE_H
+#undef LIBGLADE_XML_TXTDOMAIN
+
/* Define HAVE_WINDOW_SYSTEM if any windowing system is available. */
/* Define HAVE_WINDOW_SYSTEM if any windowing system is available. */
-#if defined (HAVE_X_WINDOWS) || defined(HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
+#if defined (HAVE_GTK) || defined (HAVE_X_WINDOWS) || defined(HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
#define HAVE_WINDOW_SYSTEM
#endif
#define HAVE_WINDOW_SYSTEM
#endif
@@
-222,7
+237,6
@@
void *alloca ();
#undef HAVE_SYS_UN_H
#undef HAVE_ULIMIT_H
#undef HAVE_UNISTD_H
#undef HAVE_SYS_UN_H
#undef HAVE_ULIMIT_H
#undef HAVE_UNISTD_H
-#undef HAVE_UTIME_H
#undef HAVE_SYS_WAIT_H
#undef HAVE_LIBINTL_H
#undef HAVE_SYS_WAIT_H
#undef HAVE_LIBINTL_H
@@
-253,9
+267,6
@@
void *alloca ();
/* Is `sys_siglist' declared by <signal.h>? */
#undef SYS_SIGLIST_DECLARED
/* Is `sys_siglist' declared by <signal.h>? */
#undef SYS_SIGLIST_DECLARED
-/* Is `struct utimbuf' declared by <utime.h>? */
-#undef HAVE_STRUCT_UTIMBUF
-
/* Is `struct timeval' declared by <sys/time.h>? */
#undef HAVE_TIMEVAL
/* Is `struct timeval' declared by <sys/time.h>? */
#undef HAVE_TIMEVAL
@@
-329,6
+340,7
@@
void *alloca ();
#undef HAVE_TZSET
#undef HAVE_ULIMIT
#undef HAVE_USLEEP
#undef HAVE_TZSET
#undef HAVE_ULIMIT
#undef HAVE_USLEEP
+#undef HAVE_UTIME
#undef HAVE_UTIMES
#undef HAVE_WAITPID
#undef HAVE_VSNPRINTF
#undef HAVE_UTIMES
#undef HAVE_WAITPID
#undef HAVE_VSNPRINTF
@@
-345,6
+357,7
@@
void *alloca ();
#undef HAVE_ISASTREAM /* SysV streams */
#undef HAVE_PTY_H /* Linux, Tru64 openpty */
#undef HAVE_LIBUTIL_H /* BSD openpty */
#undef HAVE_ISASTREAM /* SysV streams */
#undef HAVE_PTY_H /* Linux, Tru64 openpty */
#undef HAVE_LIBUTIL_H /* BSD openpty */
+#undef HAVE_UTIL_H /* NetBSD openpty */
#undef HAVE_STROPTS_H /* SysV streams */
#undef HAVE_STRTIO_H /* SysV streams TIOCSIGNAL */
#undef HAVE_STROPTS_H /* SysV streams */
#undef HAVE_STRTIO_H /* SysV streams TIOCSIGNAL */
@@
-368,6
+381,9
@@
void *alloca ();
#undef NLIST_STRUCT
#undef NLIST_STRUCT
+/* Do IPv6 hostname canonicalization before IPv4 in getaddrinfo()? */
+#undef IPV6_CANONICALIZE
+
/* Compile in support for SOCKS? */
#undef HAVE_SOCKS
/* Compile in support for SOCKS? */
#undef HAVE_SOCKS
@@
-496,12
+512,12
@@
void *alloca ();
determine where XEmacs' memory is going. */
#undef MEMORY_USAGE_STATS
determine where XEmacs' memory is going. */
#undef MEMORY_USAGE_STATS
-/* Define QUANTIFY if using Quantify from Rational/Pure/Atria Software.
+/* Define QUANTIFY if using Quantify from Rational Software.
This adds some additional calls to control data collection.
It is only intended for use by the developers. */
#undef QUANTIFY
This adds some additional calls to control data collection.
It is only intended for use by the developers. */
#undef QUANTIFY
-/* Define QUANTIFY if using Purify from Rational/Pure/Atria Software.
+/* Define PURIFY if using Purify from Rational Software.
It is only intended for use by the developers. */
#undef PURIFY
It is only intended for use by the developers. */
#undef PURIFY
@@
-831,7
+847,6
@@
on various systems. */
# define new c_new
# define this c_this
# define catch c_catch
# define new c_new
# define this c_this
# define catch c_catch
-# define not c_not
# define EXTERN_C extern "C"
# else /* C code */
# define EXTERN_C extern "C"
# else /* C code */
@@
-890,4
+905,12
@@
on various systems. */
#undef PDUMP
#undef PDUMP
+#ifndef NOT_C_CODE
+#if defined __INTEL_COMPILER && defined HAVE_ALLOCA_H
+/* icc's alloca.h pulls in <features.h>,
+ but that must be done after _GNU_SOURCE and friends are defined */
+#include <alloca.h>
+#endif
+#endif /* C code */
+
#endif /* _SRC_CONFIG_H_ */
#endif /* _SRC_CONFIG_H_ */