X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fconfig.h.in;h=1d1a9bb5b9896d8e8d1315cd2328eae2f35d044a;hb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;hp=eb7ca5c2e82e955b1babdc53205cc11c195d31a3;hpb=76759ab036458c54499a454399e19602b8ae6ce3;p=chise%2Fxemacs-chise.git diff --git a/src/config.h.in b/src/config.h.in index eb7ca5c..1d1a9bb 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -43,33 +43,6 @@ char *alloca (); #endif #endif /* C code */ - -/* Use SMART_INCLUDE to generate #include statements with variable paths. - - #### WARNING: NEVER EVER PUT A SPACE BETWEEN THE ARGUMENTS OF THE - `SMART_INCLUDE' MACRO: when the simple (direct version) is defined, you - would end up with a space in your header filename. - - Since the effect of macro expansion in #include statements is underspecified - in the C standard, and rarely used in source code, different compilers need - different implementations of SMART_INCLUDE (e.g. gcc 2.5.8 and AIX xlc). -*/ -#undef SMART_INCLUDE_INDIRECTIONS - -#if SMART_INCLUDE_INDIRECTIONS == 0 -# define SMART_INCLUDE(path,file) -#elif SMART_INCLUDE_INDIRECTIONS == 1 -# define GLUE_INCLUDE(path,file) <##path##/##file##> -# define SMART_INCLUDE(path,file) GLUE_INCLUDE(path,file) -#elif SMART_INCLUDE_INDIRECTIONS == 2 -# define GLUE_INCLUDE_2(path,file) <##path##/##file##> -# define GLUE_INCLUDE_1(path,file) GLUE_INCLUDE_2(path,file) -# define SMART_INCLUDE(path,file) GLUE_INCLUDE_1(path,file) -#else -# error SMART_INCLUDE_INDIRECTIONS was not properly defined by configure -#endif - - /* Use this to add code in a structured way to FSF-maintained source files so as to make it obvious where XEmacs changes are. */ #define XEMACS 1 @@ -100,13 +73,13 @@ char *alloca (); #undef INFODOCK_MINOR_VERSION #undef INFODOCK_BUILD_VERSION -/* Make all functions from all IEEE Stds 1003.[123] available. */ +/* Make functions from IEEE Stds 1003.[123] available. */ #undef _POSIX_C_SOURCE -/* Make all functions from Unix98 available. */ +/* Make some functions from Unix98 available. */ #undef _XOPEN_SOURCE -/* Make extensions from Unix98 available. */ +/* Make "extensions" from Unix98 available. */ #undef _XOPEN_SOURCE_EXTENDED /* Make all functions available on AIX. See AC_AIX. */ @@ -208,6 +181,8 @@ char *alloca (); #undef HAVE_XCONVERTCASE +#undef HAVE_BALLOON_HELP + /* Where do we find bitmaps? */ #undef BITMAPDIR @@ -237,7 +212,6 @@ char *alloca (); #undef HAVE_MACH_MACH_H #undef HAVE_SYS_PARAM_H #undef HAVE_SYS_PSTAT_H -#undef HAVE_SYS_STROPTS_H #undef HAVE_SYS_TIME_H #undef HAVE_SYS_TIMEB_H #undef HAVE_SYS_UN_H @@ -252,7 +226,6 @@ char *alloca (); #undef TIME_WITH_SYS_TIME #undef WORDS_BIGENDIAN #undef HAVE_VFORK_H -#undef HAVE_KSTAT_H #undef vfork #undef HAVE_LONG_FILE_NAMES @@ -269,7 +242,6 @@ char *alloca (); #undef HAVE_SHLIB #undef HAVE_DLFCN_H -#undef HAVE_LIBKSTAT #undef HAVE_LIBINTL #undef HAVE_LIBDNET #undef HAVE_LIBRESOLV @@ -288,6 +260,13 @@ char *alloca (); #undef HAVE_TM_ZONE #undef HAVE_TZNAME +/* For `getloadavg' provided by system */ +#undef HAVE_GETLOADAVG +#undef HAVE_SYS_LOADAVG_H +/* For implementing `getloadavg' ourselves */ +#undef HAVE_LIBKSTAT +#undef HAVE_KSTAT_H + /* Is `h_errno' declared by ? */ #undef HAVE_H_ERRNO @@ -319,7 +298,6 @@ char *alloca (); #undef HAVE_GETTIMEOFDAY #undef HAVE_GETWD #undef HAVE_GETCWD -#undef HAVE_GETPT #undef HAVE_LOGB #undef HAVE_LRAND48 #undef HAVE_MATHERR @@ -343,7 +321,6 @@ char *alloca (); #undef HAVE_SIGSETJMP #undef HAVE_SNPRINTF #undef HAVE_STPCPY -#undef HAVE_STRCASECMP #undef HAVE_STRERROR #undef HAVE_TZSET #undef HAVE_ULIMIT @@ -351,6 +328,22 @@ char *alloca (); #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_OPENPTY /* BSD's easy pty allocation function */ +#undef HAVE_GRANTPT /* Unix98 */ +#undef HAVE_UNLOCKPT /* Unix98 */ +#undef HAVE_PTSNAME /* Unix98 */ +#undef HAVE_KILLPG /* BSD */ +#undef HAVE_TCGETPGRP /* Posix 1 */ +#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_SOCKETS #undef HAVE_SOCKADDR_SUN_LEN #undef HAVE_MULTICAST @@ -420,16 +413,10 @@ char *alloca (); /* Does the library define ldap_parse_result () ? */ #undef HAVE_LDAP_PARSE_RESULT -/* Do we wish to link against the PostgreSQL RDBMS run-time library? - */ +/* Do we have PostgreSQL RDBMS support? */ #undef HAVE_POSTGRESQL #undef HAVE_POSTGRESQLV7 -#undef POSTGRES_H_PATH -#if defined POSTGRES_H_PATH -# define POSTGRES_INCLUDE(file) SMART_INCLUDE (POSTGRES_H_PATH,file) -#else -# define POSTGRES_INCLUDE(file) -#endif +#undef LIBPQ_FE_H_FILE /* main PostgreSQL header file */ /* Do you have the Xauth library present? This will add some extra functionality to gnuserv. */ @@ -597,37 +584,35 @@ char *alloca (); #undef off_t #undef uid_t #undef gid_t +#undef socklen_t /* If defined, use unions instead of ints. A few systems (DEC Alpha) seem to require this, probably because something with the int definitions isn't right with 64-bit systems. */ #undef USE_UNION_TYPE -/* The configuration script defines opsysfile to be the name of the - s/...h file that describes the system type you are using. - The file is chosen based on the configuration name you give. - - See the file ../etc/MACHINES for a list of systems and the - configuration names to use for them. - - See s/template.h for documentation on writing s/...h files. */ +/* The configuration script may define `opsysfile' to be the name of + the s/...h file that describes your operating system. + The file name is chosen based on the configuration name. */ #if defined (__cplusplus) && !defined (NOT_C_CODE) extern "C" { #endif + #undef config_opsysfile +#ifdef config_opsysfile #include config_opsysfile +#endif -/* The configuration script defines machfile to be the name of the - m/...h file that describes the machine you are using. The file is - chosen based on the configuration name you give. - - See the file ../etc/MACHINES for a list of machines and the - configuration names to use for them. +/* The configuration script may define `machfile' to be the name of + the m/...h file that describes the machine you are using. + The file name is chosen based on the configuration name. */ - See m/template.h for documentation on writing m/...h files. */ #undef config_machfile +#ifdef config_machfile #include config_machfile +#endif + #if defined (__cplusplus) && !defined (NOT_C_CODE) } #endif @@ -797,10 +782,6 @@ on various systems. */ # define CANNA_PURESIZE 0 #endif /* not CANNA */ -#if (defined (MSDOS) && defined (FEPCTRL)) || (defined (WIN32) && defined (USE_IME)) -#define HAVE_FEP -#endif - #if defined (HAVE_SOCKS) && !defined (DO_NOT_SOCKSIFY) #define accept Raccept #define bind Rbind @@ -839,13 +820,20 @@ on various systems. */ # define INLINE_HEADER inline extern #endif -#if defined (__cplusplus) && !defined (NOT_C_CODE) +#ifndef NOT_C_CODE /* Actually means C or C++ */ +# if defined (__cplusplus) /* Avoid C++ keywords used as ordinary C identifiers */ -#define class c_class -#define new c_new -#define this c_this -#define catch c_catch -#endif /* C++ */ +# define class c_class +# 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 +# endif +#endif /* C or C++ */ /* Strictly speaking, only int or unsigned int are valid types in a bitfield. In practice, we would like to use enums as bitfields.