X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconfig.h.in;h=2596aed3beb74ea932d707efebc397609d7f7ae9;hb=099e49380bf87248e625016bfd7c6cac8915d280;hp=1d1a9bb5b9896d8e8d1315cd2328eae2f35d044a;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1 diff --git a/src/config.h.in b/src/config.h.in index 1d1a9bb..2596aed 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -32,14 +32,24 @@ Boston, MA 02111-1307, USA. */ #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 +#elif defined (__GNUC__) #define alloca __builtin_alloca -#elif HAVE_ALLOCA_H +#elif defined __DECC +#include +#pragma intrinsic(alloca) +#elif defined __INTEL_COMPILER && defined HAVE_ALLOCA_H +/* defer #include to end of file */ +#elif defined HAVE_ALLOCA_H #include #elif defined(_AIX) #pragma alloca #elif ! defined (alloca) -char *alloca (); +void *alloca (); #endif #endif /* C code */ @@ -83,7 +93,10 @@ char *alloca (); #undef _XOPEN_SOURCE_EXTENDED /* Make all functions available on AIX. See AC_AIX. */ +/* Some AIX compilers (cc) pre-define _ALL_SOURCE, some (xlc) don't. */ +#ifndef _ALL_SOURCE #undef _ALL_SOURCE +#endif /* Make all functions available on GNU libc systems. See features.h. */ #undef _GNU_SOURCE @@ -130,6 +143,9 @@ char *alloca (); /* Use a debugging malloc? -- experimental */ #undef USE_DEBUG_MALLOC +/* Use malloc for regex failure stack? */ +#undef REGEX_MALLOC + /* Compile in TTY support? */ #undef HAVE_TTY @@ -162,8 +178,16 @@ char *alloca (); #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. */ -#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 @@ -172,14 +196,16 @@ char *alloca (); #define HAVE_UNIXOID_EVENT_LOOP #endif -/* Are we using XFree386? */ -#undef HAVE_XFREE386 +/* XFree86 has a different prototype for this function */ +#undef HAVE_XREGISTERIMINSTANTIATECALLBACK +#undef XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE #undef THIS_IS_X11R4 #undef THIS_IS_X11R5 #undef THIS_IS_X11R6 #undef HAVE_XCONVERTCASE +#undef HAVE_XTREGISTERDRAWABLE #undef HAVE_BALLOON_HELP @@ -204,6 +230,7 @@ char *alloca (); configure.in. */ #undef HAVE_MCHECK_H #undef HAVE_A_OUT_H +#undef HAVE_ELF_H #undef HAVE_CYGWIN_VERSION_H #undef HAVE_FCNTL_H #undef HAVE_INTTYPES_H @@ -217,7 +244,6 @@ char *alloca (); #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 @@ -240,7 +266,8 @@ char *alloca (); #undef HAVE_SHL_LOAD #undef HAVE_DLD_INIT #undef HAVE_SHLIB -#undef HAVE_DLFCN_H +#undef HAVE_DYLD +#undef DLSYM_NEEDS_UNDERSCORE #undef HAVE_LIBINTL #undef HAVE_LIBDNET @@ -249,9 +276,6 @@ char *alloca (); /* Is `sys_siglist' declared by ? */ #undef SYS_SIGLIST_DECLARED -/* Is `struct utimbuf' declared by ? */ -#undef HAVE_STRUCT_UTIMBUF - /* Is `struct timeval' declared by ? */ #undef HAVE_TIMEVAL @@ -325,13 +349,14 @@ char *alloca (); #undef HAVE_TZSET #undef HAVE_ULIMIT #undef HAVE_USLEEP +#undef HAVE_UTIME #undef HAVE_UTIMES #undef HAVE_WAITPID #undef HAVE_VSNPRINTF /* PTY support functions */ #undef HAVE_GETPT /* glibc's easy pty allocation function */ -#undef HAVE__GETPT /* SGI's easy pty allocation function */ +#undef HAVE__GETPTY /* SGI's easy pty allocation function */ #undef HAVE_OPENPTY /* BSD's easy pty allocation function */ #undef HAVE_GRANTPT /* Unix98 */ #undef HAVE_UNLOCKPT /* Unix98 */ @@ -341,8 +366,9 @@ char *alloca (); #undef HAVE_ISASTREAM /* SysV streams */ #undef HAVE_PTY_H /* Linux, Tru64 openpty */ #undef HAVE_LIBUTIL_H /* BSD openpty */ -#undef HAVE_SYS_STROPTS_H /* SysV streams */ -#undef HAVE_SYS_STRTIO_H /* SysV streams TIOCSIGNAL */ +#undef HAVE_UTIL_H /* NetBSD openpty */ +#undef HAVE_STROPTS_H /* SysV streams */ +#undef HAVE_STRTIO_H /* SysV streams TIOCSIGNAL */ #undef HAVE_SOCKETS #undef HAVE_SOCKADDR_SUN_LEN @@ -364,6 +390,9 @@ char *alloca (); #undef NLIST_STRUCT +/* Do IPv6 hostname canonicalization before IPv4 in getaddrinfo()? */ +#undef IPV6_CANONICALIZE + /* Compile in support for SOCKS? */ #undef HAVE_SOCKS @@ -394,6 +423,15 @@ char *alloca (); /* Compile in support for DBM databases? May require libgdbm or libdbm. */ #undef HAVE_DBM +/* Define to 1 if the system has the type `u_int8_t'. */ +#undef HAVE_U_INT8_T +/* Define to 1 if the system has the type `u_int16_t'. */ +#undef HAVE_U_INT16_T +/* Define to 1 if the system has the type `u_int32_t'. */ +#undef HAVE_U_INT32_T +/* Define to 1 if the system has the type `u_int64_t'. */ +#undef HAVE_U_INT64_T + /* Compile in support for Berkeley DB style databases? May require libdb. */ #undef HAVE_BERKELEY_DB /* Full #include file path for Berkeley DB's db.h */ @@ -492,12 +530,12 @@ char *alloca (); 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 -/* 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 @@ -545,6 +583,22 @@ char *alloca (); if you're working with ASCII files. */ #undef MULE +/* Define this if you want CONCORD support */ +#undef HAVE_CONCORD + +/* Define this if you want CHISE support + (CHaracter Information Service Environment) */ +#undef HAVE_CHISE + +/* Define if you are using libchise */ +#undef HAVE_LIBCHISE + +/* Define this if you want UTF-2000 support (character representation + based on character object model). */ +#undef UTF2000 + +#undef CHAR_IS_UCS4 + /* Define this if you want file coding support */ #undef FILE_CODING @@ -707,7 +761,7 @@ extern "C" { Also, SunOS 4.1.1 contains buggy versions of strcmp and strcpy that sometimes reference memory past the end of the string, which can segv. - I don't know whether this is has been fixed as of 4.1.2 or 4.1.3. */ + I don't know whether this has been fixed as of 4.1.2 or 4.1.3. */ #if defined (sparc) && !defined (USG) #define OBJECTS_SYSTEM sunOS-fix.o strcmp.o strcpy.o #endif @@ -796,6 +850,8 @@ on various systems. */ #undef SIZEOF_LONG_LONG #undef SIZEOF_VOID_P +#undef INTPTR_T_IN_CYGWIN_TYPES_H + #ifndef BITS_PER_CHAR #define BITS_PER_CHAR 8 #endif @@ -827,7 +883,6 @@ on various systems. */ # define new c_new # define this c_this # define catch c_catch -# define not c_not # define EXTERN_C extern "C" # else /* C code */ @@ -886,4 +941,12 @@ on various systems. */ #undef PDUMP +#ifndef NOT_C_CODE +#if defined __INTEL_COMPILER && defined HAVE_ALLOCA_H +/* icc's alloca.h pulls in , + but that must be done after _GNU_SOURCE and friends are defined */ +#include +#endif +#endif /* C code */ + #endif /* _SRC_CONFIG_H_ */