From: Juanma Barranquero Date: Fri, 6 Jul 2012 17:19:33 +0000 (+0200) Subject: * nt/config.nt: Complete rework to bring it in sync with autogen/config.in. X-Git-Tag: emacs-24.2.90~1199^2~172 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f247498ead8b1898decf47537d59965340d6cebd;p=emacs.git * nt/config.nt: Complete rework to bring it in sync with autogen/config.in. All Windows-specific code moved to src/s/ms-w32.h. * src/s/ms-w32.h: Settings not specific to Windows moved to nt/config.nt. Windows-specific code from nt/config.nt moved here. Obsolete settings removed. --- diff --git a/nt/ChangeLog b/nt/ChangeLog index 90045632333..4dd9d853173 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2012-07-04 Juanma Barranquero + Eli Zaretskii + + * config.nt: Complete rework to bring it in sync with autogen/config.in. + All Windows-specific code moved to src/s/ms-w32.h. + 2012-07-04 Juanma Barranquero Eli Zaretskii diff --git a/nt/config.nt b/nt/config.nt index 9ceb3549cbe..866d870c00a 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1,6 +1,7 @@ -/* GNU Emacs site configuration template file. -*- C -*- +/* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc. +Copyright (C) 1988, 1993-1994, 2001-2012 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -17,328 +18,1387 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ +/* NOTE: + This file is intentionally kept in sync with autogen/config.in to + ease maintenance. Please do not remove non-Windows related stuff + unless strictly necessary. Also, before adding anything here + consider whether src/s/ms-w32.h would be a better place; this is + particularly true for gcc vs. MSVC conditional defines, MinGW or + MSVC specific code, and macros not already defined in config.in. */ -/* No code in Emacs #includes config.h twice, but some of the code +/* No code in Emacs #includes config.h twice, but some bits of code intended to work with other packages as well (like gmalloc.c) think they can include it as many times as they like. */ #ifndef EMACS_CONFIG_H #define EMACS_CONFIG_H -/* These are all defined in the top-level Makefile by configure. - They're here only for reference. */ -/* Define GNU_MALLOC if you want to use the GNU memory allocator. */ -#define GNU_MALLOC +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD -/* Define if you are using the GNU C Library. */ +/* Define to the number of bits in type 'ptrdiff_t'. */ +#undef BITSIZEOF_PTRDIFF_T + +/* Define to the number of bits in type 'sig_atomic_t'. */ +#undef BITSIZEOF_SIG_ATOMIC_T + +/* Define to the number of bits in type 'size_t'. */ +#undef BITSIZEOF_SIZE_T + +/* Define to the number of bits in type 'wchar_t'. */ +#undef BITSIZEOF_WCHAR_T + +/* Define to the number of bits in type 'wint_t'. */ +#undef BITSIZEOF_WINT_T + +/* Define if SA_RESTART should not be used. */ +#undef BROKEN_SA_RESTART + +/* Define if SIGIO should not be used. */ +#undef BROKEN_SIGIO + +/* Define if Emacs cannot be dumped on your system. */ +#undef CANNOT_DUMP + +/* Define this to enable compile time checks for the Lisp_Object data type. */ +#undef CHECK_LISP_OBJECT_TYPE + +/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP + systems. This function is required for 'alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END + +/* Define to 1 if using 'alloca.c'. */ +#undef C_ALLOCA + +/* Define to 1 for DGUX with . */ +#undef DGUX + +/* Define to 1 if you are using the GNU C Library. */ #undef DOUG_LEA_MALLOC -/* Define REL_ALLOC if you want to use the relocating allocator for - buffer space. */ -#define REL_ALLOC +/* Define to the canonical Emacs configuration name. */ +#undef EMACS_CONFIGURATION + +/* Define to the options passed to configure. */ +#undef EMACS_CONFIG_OPTIONS + +/* Define to 1 if expensive run-time data type and consistency checks are + enabled. */ +#undef ENABLE_CHECKING + +/* Define to 1 if futimesat mishandles a NULL file name. */ +#undef FUTIMESAT_NULL_BUG + +/* Define this to check for errors in cons list. */ +#undef GC_CHECK_CONS_LIST + +/* Define this temporarily to hunt a bug. If defined, the size of strings is + redundantly recorded in sdata structures so that it can be compared to the + sizes recorded in Lisp strings. */ +#undef GC_CHECK_STRING_BYTES + +/* Define this to check the string free list. */ +#undef GC_CHECK_STRING_FREE_LIST + +/* Define this to check for short string overrun. */ +#undef GC_CHECK_STRING_OVERRUN + +/* Define to 1 if the `getpgrp' function requires zero arguments. */ +#undef GETPGRP_VOID + +/* Define if gettimeofday clobbers the localtime buffer. */ +#undef GETTIMEOFDAY_CLOBBERS_LOCALTIME + +/* Define this to 'void' or 'struct timezone' to match the system's + declaration of the second argument to gettimeofday. */ +#undef GETTIMEOFDAY_TIMEZONE + +/* Define this to enable glyphs debugging code. */ +/* #undef GLYPH_DEBUG */ + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module fscanf shall be considered present. */ +#undef GNULIB_FSCANF + +/* enable some gnulib portability checks */ +#undef GNULIB_PORTCHECK + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module scanf shall be considered present. */ +#undef GNULIB_SCANF + +/* Define to 1 if you want to use the GNU memory allocator. */ +#define GNU_MALLOC 1 + +/* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */ +#undef HAVE_AIX_SMT_EXP + +/* Define to 1 if you have the `alarm' function. */ +#undef HAVE_ALARM + +/* Define to 1 if you have 'alloca' after including , a header that + may be supplied by this distribution. */ +#undef HAVE_ALLOCA + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H + +/* Define to 1 if ALSA is available. */ +#undef HAVE_ALSA + +/* Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works. */ +#undef HAVE_ATTRIBUTE_ALIGNED + +/* Define to 1 if strtold conforms to C99. */ +#undef HAVE_C99_STRTOLD + +/* Define to 1 if you have the `cbrt' function. */ +#undef HAVE_CBRT + +/* Define to 1 if you have the `cfmakeraw' function. */ +#undef HAVE_CFMAKERAW + +/* Define to 1 if you have the `cfsetspeed' function. */ +#undef HAVE_CFSETSPEED + +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + +/* Define to 1 if you have the `clock_settime' function. */ +#undef HAVE_CLOCK_SETTIME + +/* Define to 1 if you have the `closedir' function. */ +#define HAVE_CLOSEDIR 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_COFF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_COM_ERR_H + +/* Define to 1 if you have the `copysign' function. */ +#undef HAVE_COPYSIGN + +/* Define to 1 if using D-Bus. */ +#undef HAVE_DBUS + +/* Define to 1 if you have the `dbus_type_is_valid' function. */ +#undef HAVE_DBUS_TYPE_IS_VALID + +/* Define to 1 if you have the `dbus_validate_bus_name' function. */ +#undef HAVE_DBUS_VALIDATE_BUS_NAME + +/* Define to 1 if you have the `dbus_validate_interface' function. */ +#undef HAVE_DBUS_VALIDATE_INTERFACE + +/* Define to 1 if you have the `dbus_validate_member' function. */ +#undef HAVE_DBUS_VALIDATE_MEMBER + +/* Define to 1 if you have the `dbus_validate_path' function. */ +#undef HAVE_DBUS_VALIDATE_PATH + +/* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */ +#undef HAVE_DBUS_WATCH_GET_UNIX_FD + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `localtime_r', and to 0 if you + don't. */ +#undef HAVE_DECL_LOCALTIME_R + +/* Define to 1 if you have the declaration of `strmode', and to 0 if you + don't. */ +#undef HAVE_DECL_STRMODE + +/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you + don't. */ +#undef HAVE_DECL_STRTOIMAX + +/* Define to 1 if you have the declaration of `strtoll', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOLL 1 + +/* Define to 1 if you have the declaration of `strtoull', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOULL 1 + +/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOUMAX 1 + +/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you + don't. */ +#undef HAVE_DECL_SYS_SIGLIST + +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#define HAVE_DECL_TZNAME 1 + +/* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you + don't. */ +#undef HAVE_DECL___SYS_SIGLIST + +/* Define to 1 if you have the header file. */ +#undef HAVE_DES_H + +/* Define to 1 if dynamic ptys are supported. */ +#undef HAVE_DEV_PTMX + +/* Define to 1 if you have the `difftime' function. */ +#undef HAVE_DIFFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you have the 'dup2' function. */ +#define HAVE_DUP2 1 + +/* Define to 1 if you have the `endgrent' function. */ +#undef HAVE_ENDGRENT + +/* Define to 1 if you have the `endpwent' function. */ +#undef HAVE_ENDPWENT + +/* Define to 1 if you have the `euidaccess' function. */ +#undef HAVE_EUIDACCESS + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `fmod' function. */ +#define HAVE_FMOD 1 + +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK + +/* Define to 1 if you have the `fpathconf' function. */ +#undef HAVE_FPATHCONF + +/* Define to 1 if you have the `freeifaddrs' function. */ +#undef HAVE_FREEIFADDRS + +/* Define to 1 if using the freetype and fontconfig libraries. */ +#undef HAVE_FREETYPE + +/* Define to 1 if you have the `frexp' function. */ +#define HAVE_FREXP 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#undef HAVE_FSEEKO + +/* Define to 1 if you have the `fsync' function. */ +#define HAVE_FSYNC 1 + +/* Define to 1 if you have the `futimens' function. */ +#undef HAVE_FUTIMENS + +/* Define to 1 if you have the `futimes' function. */ +#undef HAVE_FUTIMES + +/* Define to 1 if you have the `futimesat' function. */ +#undef HAVE_FUTIMESAT + +/* Define to 1 if you have the `gai_strerror' function. */ +#undef HAVE_GAI_STRERROR + +/* Define to 1 if using GConf. */ +#undef HAVE_GCONF + +/* Define to 1 if you have the `getaddrinfo' function. */ +#undef HAVE_GETADDRINFO + +/* Define to 1 if you have the `getcwd' function. + If you think about defining HAVE_GETCWD, don't: the alternative + getwd is redefined on w32.c, and does not really return the current + directory, to get the desired results elsewhere in Emacs. */ +#undef HAVE_GETCWD + +/* Define to 1 if you have the `getdelim' function. */ +#undef HAVE_GETDELIM + +/* Define to 1 if you have the `getgrent' function. */ +#undef HAVE_GETGRENT + +/* Define to 1 if you have the `gethostname' function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS + +/* Define to 1 if you have the `getline' function. */ +#undef HAVE_GETLINE + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the `getopt_long_only' function. */ +#undef HAVE_GETOPT_LONG_ONLY + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getpeername' function. */ +#define HAVE_GETPEERNAME 1 + +/* Define to 1 if you have the `getpt' function. */ +#undef HAVE_GETPT + +/* Define to 1 if you have the `getpwent' function. */ +#undef HAVE_GETPWENT + +/* Define to 1 if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE + +/* Define to 1 if you have the `getsockname' function. */ +#define HAVE_GETSOCKNAME 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `getwd' function. */ +#undef HAVE_GETWD + +/* Define to 1 if you have the `get_current_dir_name' function. */ +#undef HAVE_GET_CURRENT_DIR_NAME + +/* Define to 1 if you have a gif (or ungif) library. */ +#undef HAVE_GIF + +/* Define if using GnuTLS. */ +#undef HAVE_GNUTLS + +/* Define if using GnuTLS certificate verification callbacks. */ +#undef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY + +/* Define to 1 if you have the `gnutls_certificate_set_verify_function' + function. */ +#undef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION + +/* Define to 1 if you have the gpm library (-lgpm). */ +#undef HAVE_GPM + +/* Define to 1 if you have the `grantpt' function. */ +#undef HAVE_GRANTPT + +/* Define to 1 if using GSettings. */ +#undef HAVE_GSETTINGS + +/* Define to 1 if using GTK 3 or later. */ +#undef HAVE_GTK3 + +/* Define to 1 if you have the `gtk_adjustment_get_page_size' function. */ +#undef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE + +/* Define to 1 if you have the `gtk_dialog_get_action_area' function. */ +#undef HAVE_GTK_DIALOG_GET_ACTION_AREA + +/* Define to 1 if you have the `gtk_file_selection_new' function. */ +#undef HAVE_GTK_FILE_SELECTION_NEW + +/* Define to 1 if you have the `gtk_main' function. */ +#undef HAVE_GTK_MAIN + +/* Define to 1 if you have the `gtk_orientable_set_orientation' function. */ +#undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION + +/* Define to 1 if you have the `gtk_widget_get_mapped' function. */ +#undef HAVE_GTK_WIDGET_GET_MAPPED + +/* Define to 1 if you have the `gtk_widget_get_sensitive' function. */ +#undef HAVE_GTK_WIDGET_GET_SENSITIVE + +/* Define to 1 if you have the `gtk_widget_get_window' function. */ +#undef HAVE_GTK_WIDGET_GET_WINDOW + +/* Define to 1 if you have the `gtk_widget_set_has_window' function. */ +#undef HAVE_GTK_WIDGET_SET_HAS_WINDOW + +/* Define to 1 if you have the `gtk_window_set_has_resize_grip' function. */ +#undef HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP + +/* Define to 1 if you have the `g_type_init' function. */ +#undef HAVE_G_TYPE_INIT + +/* Define to 1 if netdb.h declares h_errno. */ +#define HAVE_H_ERRNO 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_IFADDRS_H + +/* Define to 1 if using imagemagick. */ +#undef HAVE_IMAGEMAGICK + +/* Define to 1 if you have inet sockets. */ +#define HAVE_INET_SOCKETS 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the jpeg library (-ljpeg). */ +#undef HAVE_JPEG + +/* Define to 1 if you have the header file. */ +#undef HAVE_KERBEROSIV_DES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_KERBEROSIV_KRB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_KERBEROS_DES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_KERBEROS_KRB_H + +/* Define to 1 if `e_text' is a member of `krb5_error'. */ +#undef HAVE_KRB5_ERROR_E_TEXT + +/* Define to 1 if `text' is a member of `krb5_error'. */ +#undef HAVE_KRB5_ERROR_TEXT + +/* Define to 1 if you have the header file. */ +#undef HAVE_KRB5_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_KRB_H + +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* Define to 1 if you have the `com_err' library (-lcom_err). */ +#undef HAVE_LIBCOM_ERR + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +#undef HAVE_LIBCRYPTO + +/* Define to 1 if you have the `des' library (-ldes). */ +#undef HAVE_LIBDES + +/* Define to 1 if you have the `des425' library (-ldes425). */ +#undef HAVE_LIBDES425 + +/* Define to 1 if you have the `dgc' library (-ldgc). */ +#undef HAVE_LIBDGC + +/* Define to 1 if you have the `dnet' library (-ldnet). */ +#undef HAVE_LIBDNET + +/* Define to 1 if you have the hesiod library (-lhesiod). */ +#undef HAVE_LIBHESIOD + +/* Define to 1 if you have the `k5crypto' library (-lk5crypto). */ +#undef HAVE_LIBK5CRYPTO + +/* Define to 1 if you have the `krb' library (-lkrb). */ +#undef HAVE_LIBKRB + +/* Define to 1 if you have the `krb4' library (-lkrb4). */ +#undef HAVE_LIBKRB4 + +/* Define to 1 if you have the `krb5' library (-lkrb5). */ +#undef HAVE_LIBKRB5 + +/* Define to 1 if you have the `kstat' library (-lkstat). */ +#undef HAVE_LIBKSTAT + +/* Define to 1 if you have the `lockfile' library (-llockfile). */ +#undef HAVE_LIBLOCKFILE + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* Define to 1 if you have the `mail' library (-lmail). */ +#undef HAVE_LIBMAIL + +/* Define to 1 if using libotf. */ +#undef HAVE_LIBOTF + +/* Define to 1 if you have the `perfstat' library (-lperfstat). */ +#undef HAVE_LIBPERFSTAT + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBPNG_PNG_H + +/* Define to 1 if you have the `pthreads' library (-lpthreads). */ +#undef HAVE_LIBPTHREADS + +/* Define to 1 if you have the resolv library (-lresolv). */ +#undef HAVE_LIBRESOLV + +/* Define to 1 if using SELinux. */ +#undef HAVE_LIBSELINUX + +/* Define to 1 if you have the `Xext' library (-lXext). */ +#undef HAVE_LIBXEXT + +/* Define to 1 if you have the libxml library (-lxml2). */ +#undef HAVE_LIBXML2 + +/* Define to 1 if you have the `Xmu' library (-lXmu). */ +#undef HAVE_LIBXMU + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_VERSION_H + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the `logb' function. */ +#define HAVE_LOGB 1 + +/* Define to 1 if you support file names longer than 14 characters. */ +#define HAVE_LONG_FILE_NAMES 1 + +/* Define to 1 if the system has the type 'long long int'. */ +#undef HAVE_LONG_LONG_INT + +/* Define to 1 if you have the `lrand48' function. */ +#undef HAVE_LRAND48 + +/* Define to 1 if you have the `lstat' function. */ +#undef HAVE_LSTAT + +/* Define to 1 if you have the `lutimes' function. */ +#undef HAVE_LUTIMES + +/* Define to 1 if using libm17n-flt. */ +#undef HAVE_M17N_FLT + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACHINE_SOUNDCARD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACH_MACH_H + +/* Define to 1 if you have the `MagickExportImagePixels' function. */ +#undef HAVE_MAGICKEXPORTIMAGEPIXELS + +/* Define to 1 if you have the `MagickMergeImageLayers' function. */ +#undef HAVE_MAGICKMERGEIMAGELAYERS + +/* Define to 1 if you have the header file. */ +#undef HAVE_MAILLOCK_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_MALLOC_H + +/* Define to 1 if declares mbstate_t. */ +#undef HAVE_MBSTATE_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have mouse menus. (This is automatic if you use X, but + the option to specify it remains.) It is also defined with other window + systems that support xmenu.c. */ +#undef HAVE_MENUS + +/* Define to 1 if you have the `mkdir' function. */ +#define HAVE_MKDIR 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#undef HAVE_MKSTEMP + +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define if you have mouse support. */ +#define HAVE_MOUSE 1 + +/* Define to 1 if you have the `nanotime' function. */ +#undef HAVE_NANOTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_DL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NLIST_H + +/* Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on + Mac OS X. */ +#undef HAVE_NS + +/* Define to 1 if libotf has OTF_get_variation_glyphs. */ +#undef HAVE_OTF_GET_VARIATION_GLYPHS + +/* Define to 1 if personality LINUX32 can be set. */ +#undef HAVE_PERSONALITY_LINUX32 + +/* Define to 1 if you have the png library (-lpng). */ +#undef HAVE_PNG + +/* Define to 1 if you have the header file. */ +#undef HAVE_PNG_H + +/* Define to 1 if you have the `posix_memalign' function. */ +#undef HAVE_POSIX_MEMALIGN + +/* Define if you have the /proc filesystem. */ +#undef HAVE_PROCFS + +/* Define to 1 if you have the `pselect' function. */ +#undef HAVE_PSELECT + +/* Define to 1 if you have the `pstat_getdynamic' function. */ +#undef HAVE_PSTAT_GETDYNAMIC + +/* Define to 1 if you have pthread (-lpthread). */ +#undef HAVE_PTHREAD + +/* Define to 1 if you have the header file. */ +#undef HAVE_PTHREAD_H + +/* Define to 1 if the pthread_sigmask function can be used (despite bugs). */ +#undef HAVE_PTHREAD_SIGMASK + +/* Define to 1 if you have the header file. */ +#undef HAVE_PTY_H + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define to 1 if you have the `random' function. */ +#define HAVE_RANDOM 1 + +/* Define to 1 if you have the `readlink' function. */ +#undef HAVE_READLINK + +/* Define to 1 if you have the `readlinkat' function. */ +#undef HAVE_READLINKAT + +/* Define to 1 if you have the `recvfrom' function. */ +#define HAVE_RECVFROM 1 + +/* Define to 1 if you have the `rename' function. */ +#define HAVE_RENAME 1 + +/* Define to 1 if res_init is available. */ +#undef HAVE_RES_INIT + +/* Define to 1 if you have the `rint' function. */ +#undef HAVE_RINT + +/* Define to 1 if you have the `rmdir' function. */ +#define HAVE_RMDIR 1 + +/* Define to 1 if using librsvg. */ +#undef HAVE_RSVG + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `sendto' function. */ +#define HAVE_SENDTO 1 + +/* Define to 1 if you have the `setitimer' function. */ +#undef HAVE_SETITIMER + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the `setpgid' function. */ +#undef HAVE_SETPGID + +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID + +/* Define to 1 if you have the `shutdown' function. */ +#define HAVE_SHUTDOWN 1 + +/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ +#undef HAVE_SIGNED_SIG_ATOMIC_T + +/* Define to 1 if 'wchar_t' is a signed integer type. */ +#undef HAVE_SIGNED_WCHAR_T + +/* Define to 1 if 'wint_t' is a signed integer type. */ +#undef HAVE_SIGNED_WINT_T + +/* Define to 1 if the system has the type `sigset_t'. */ +#undef HAVE_SIGSET_T + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have sound support. */ +#define HAVE_SOUND 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SOUNDCARD_H + +/* Define to 1 if `speed_t' is declared by . */ +#undef HAVE_SPEED_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_EXT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if you have the `strsignal' function. */ +#undef HAVE_STRSIGNAL + +/* Define to 1 if you have the `strtoimax' function. */ +#undef HAVE_STRTOIMAX + +/* Define to 1 if you have the `strtoll' function. */ +#undef HAVE_STRTOLL + +/* Define to 1 if you have the `strtoull' function. */ +#define HAVE_STRTOULL 1 + +/* Define to 1 if you have the `strtoumax' function. */ +#define HAVE_STRTOUMAX 1 + +/* Define to 1 if `ifr_addr' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_ADDR + +/* Define to 1 if `ifr_addr.sa_len' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN + +/* Define to 1 if `ifr_broadaddr' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_BROADADDR + +/* Define to 1 if `ifr_flags' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_FLAGS + +/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_HWADDR + +/* Define to 1 if `ifr_netmask' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_NETMASK + +/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */ +#undef HAVE_STRUCT_NLIST_N_UN_N_NAME + +/* Define to 1 if `st_atimensec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_ATIMENSEC + +/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC + +/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC + +/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC + +/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC + +/* Define to 1 if `st_birthtimespec.tv_nsec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + +/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC + +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ +#undef HAVE_STRUCT_TM_TM_ZONE + +/* Define if struct utimbuf is declared -- usually in . Some systems + have utime.h but don't declare the struct anywhere. */ +#undef HAVE_STRUCT_UTIMBUF + +/* Define if struct stat has an st_dm_mode member. */ +#undef HAVE_ST_DM_MODE + +/* Define to 1 if you have the `symlink' function. */ +#undef HAVE_SYMLINK + +/* Define to 1 if you have the `sync' function. */ +#undef HAVE_SYNC + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_BITYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_LOADAVG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOUNDCARD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSTEMINFO_H + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VLIMIT_H + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TERM_H + +/* Define to 1 if you have the tiff library (-ltiff). */ +#undef HAVE_TIFF + +/* Define if struct tm has the tm_gmtoff member. */ +#undef HAVE_TM_GMTOFF + +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +#undef HAVE_TM_ZONE + +/* Define to 1 if you have the `touchlock' function. */ +#undef HAVE_TOUCHLOCK + +/* Define to 1 if you don't have `tm_zone' but do have the external array + `tzname'. */ +#define HAVE_TZNAME 1 + +/* Define to 1 if you have the `tzset' function. */ +#define HAVE_TZSET 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if the system has the type 'unsigned long long int'. */ +#undef HAVE_UNSIGNED_LONG_LONG_INT + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIL_H + +/* Define to 1 if you have the `utimensat' function. */ +#undef HAVE_UTIMENSAT + +/* Define to 1 if you have the `utimes' function. */ +#undef HAVE_UTIMES + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTMP_H + +/* Define to 1 if you have the `vfork' function. */ +#undef HAVE_VFORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_VFORK_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + +/* Define if you have the 'wchar_t' type. */ +#define HAVE_WCHAR_T 1 + +/* Define if you have a window system. */ +#undef HAVE_WINDOW_SYSTEM + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINSOCK2_H + +/* Define to 1 if `fork' works. */ +#undef HAVE_WORKING_FORK + +/* Define if utimes works properly. */ +#undef HAVE_WORKING_UTIMES + +/* Define to 1 if `vfork' works. */ +#undef HAVE_WORKING_VFORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_WS2TCPIP_H + +/* Define to 1 if you want to use version 11 of X windows. Otherwise, Emacs + expects to use version 10. */ +#undef HAVE_X11 + +/* Define to 1 if you have the X11R6 or newer version of Xlib. */ +#undef HAVE_X11R6 + +/* Define if you have usable X11R6-style XIM support. */ +#undef HAVE_X11R6_XIM + +/* Define to 1 if you have the X11R6 or newer version of Xt. */ +#undef HAVE_X11XTR6 + +/* Define to 1 if you have the Xaw3d library (-lXaw3d). */ +#undef HAVE_XAW3D + +/* Define to 1 if you have the Xft library. */ +#undef HAVE_XFT + +/* Define to 1 if XIM is available */ +#undef HAVE_XIM + +/* Define to 1 if you have the XkbGetKeyboard function. */ +#undef HAVE_XKBGETKEYBOARD + +/* Define to 1 if you have the Xpm library (-lXpm). */ +#undef HAVE_XPM + +/* Define to 1 if you have the `XrmSetDatabase' function. */ +#undef HAVE_XRMSETDATABASE + +/* Define to 1 if you have the `XScreenNumberOfScreen' function. */ +#undef HAVE_XSCREENNUMBEROFSCREEN + +/* Define to 1 if you have the `XScreenResourceString' function. */ +#undef HAVE_XSCREENRESOURCESTRING + +/* Define if you have usable i18n support. */ +#undef HAVE_X_I18N + +/* Define to 1 if you have the SM library (-lSM). */ +#undef HAVE_X_SM + +/* Define to 1 if you want to use the X window system. */ +#undef HAVE_X_WINDOWS + +/* Define to 1 if the system has the type `_Bool'. */ +#undef HAVE__BOOL + +/* Define to 1 if you have the `_ftime' function. */ +#undef HAVE__FTIME + +/* Define to 1 if you have the `__builtin_unwind_init' function. */ +#undef HAVE___BUILTIN_UNWIND_INIT + +/* Define to 1 if you have the `__executable_start' function. */ +#undef HAVE___EXECUTABLE_START + +/* Define to 1 if you have the `__fpending' function. */ +#undef HAVE___FPENDING + +/* Define to support using a Hesiod database to find the POP server. */ +#undef HESIOD + +/* Define to support Kerberos-authenticated POP mail retrieval. */ +#undef KERBEROS + +/* Define to use Kerberos 5 instead of Kerberos 4. */ +#undef KERBEROS5 + +/* Define to 1 if localtime caches TZ. */ +#define LOCALTIME_CACHE 1 + +/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing + slash. */ +#undef LSTAT_FOLLOWS_SLASHED_SYMLINK + +/* String giving fallback POP mail host. */ +#undef MAILHOST + +/* Define to unlink, rather than empty, mail spool after reading. */ +#undef MAIL_UNLINK_SPOOL + +/* Define if the mailer uses flock to interlock the mail spool. */ +#undef MAIL_USE_FLOCK + +/* Define if the mailer uses lockf to interlock the mail spool. */ +#undef MAIL_USE_LOCKF + +/* Define to support MMDF mailboxes in movemail. */ +#undef MAIL_USE_MMDF + +/* Define to support POP mail retrieval. */ +#define MAIL_USE_POP 1 + +/* Define to 1 if you don't have struct exception in math.h. */ +#define NO_MATHERR 1 + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + +/* Define if termio.h should not be included. */ +#undef NO_TERMIO + +/* Define to 1 if `NSInteger' is defined. */ +#undef NS_HAVE_NSINTEGER + +/* Define to 1 if you are using NS windowing under MacOS X. */ +#undef NS_IMPL_COCOA + +/* Define to 1 if you are using NS windowing under GNUstep. */ +#undef NS_IMPL_GNUSTEP + +/* Define to 1 if the nlist n_name member is a pointer */ +#undef N_NAME_POINTER + +/* Define if the C compiler is the linker. */ +#define ORDINARY_LINK 1 + +/* Name of package */ +#define PACKAGE "emacs" + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno. + */ +#undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO + +/* Define to 1 if pthread_sigmask() may returns 0 and have no effect. */ +#undef PTHREAD_SIGMASK_INEFFECTIVE -/* Enable conservative stack marking for GC. */ -#define GC_MARK_STACK 1 +/* Define to 1 if pthread_sigmask() unblocks signals incorrectly. */ +#undef PTHREAD_SIGMASK_UNBLOCK_BUG -/* MSVC ignores the "register" keyword, so test fails even though - setjmp does work. */ -#define GC_SETJMP_WORKS 1 +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'ptrdiff_t'. */ +#undef PTRDIFF_T_SUFFIX -/* Define HAVE_X_WINDOWS if you want to use the X window system. */ -#undef HAVE_X_WINDOWS +/* Define to 1 if readlink fails to recognize a trailing slash. */ +#undef READLINK_TRAILING_SLASH_BUG -/* Define HAVE_X11 if you want to use version 11 of X windows. - Otherwise, Emacs expects to use version 10. */ -#undef HAVE_X11 +/* Define REL_ALLOC if you want to use the relocating allocator for buffer + space. */ +#define REL_ALLOC 1 -/* Define if using an X toolkit. */ -#undef USE_X_TOOLKIT +/* Define to 1 if stat needs help when passed a directory name with a trailing + slash */ +#undef REPLACE_FUNC_STAT_DIR -/* Define this if you have Motif 2.1 or newer. */ -#undef HAVE_MOTIF_2_1 +/* Define to 1 if stat needs help when passed a file name with a trailing + slash */ +#undef REPLACE_FUNC_STAT_FILE -/* Define HAVE_MENUS if you have mouse menus. - (This is automatic if you use X, but the option to specify it remains.) - It is also defined with other window systems that support xmenu.c. */ -#undef HAVE_MENUS +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'sig_atomic_t'. */ +#undef SIG_ATOMIC_T_SUFFIX -/* Define if we have the X11R6 or newer version of Xt. */ -#undef HAVE_X11XTR6 +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'size_t'. */ +#undef SIZE_T_SUFFIX -/* Define if we have the X11R6 or newer version of Xlib. */ -#undef HAVE_X11R6 +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION -/* Define if netdb.h declares h_errno. */ -#undef HAVE_H_ERRNO +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +#undef STAT_MACROS_BROKEN -/* If we're using any sort of window system, define some consequences. */ -#ifdef HAVE_X_WINDOWS -#define HAVE_WINDOW_SYSTEM -#define HAVE_MOUSE -#endif +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Define USER_FULL_NAME to return a string - that is the user's full name. - It can assume that the variable `pw' - points to the password file entry for this user. +/* Define to 1 on System V Release 4. */ +#undef SVR4 - At some sites, the pw_gecos field contains - the user's full name. If neither this nor any other - field contains the right thing, use pw_name, - giving the user's login name, since that is better than nothing. */ -#define USER_FULL_NAME pw->pw_gecos +/* Process async input synchronously. */ +#undef SYNC_INPUT -/* Define AMPERSAND_FULL_NAME if you use the convention - that & in the full name stands for the login id. */ -#undef AMPERSAND_FULL_NAME +/* Define to use system malloc. */ +#undef SYSTEM_MALLOC -/* Things set by --with options in the configure script. */ +/* The type of system you are compiling for; sets `system-type'. */ +#define SYSTEM_TYPE "windows-nt" -/* Define to support POP mail retrieval. */ -#undef MAIL_USE_POP +/* Define to 1 if you use terminfo instead of termcap. */ +#undef TERMINFO -/* Define to support Kerberos-authenticated POP mail retrieval. */ -#undef KERBEROS -/* Define to use Kerberos 5 instead of Kerberos 4 */ -#undef KERBEROS5 +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 -/* Define to support using a Hesiod database to find the POP server. */ -#undef HESIOD +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME -/* Some things figured out by the configure script, grouped as they are in - configure.in. */ -#ifndef _ALL_SOURCE /* suppress warning if this is pre-defined */ -#undef _ALL_SOURCE -#endif -#undef HAVE_SYS_SELECT_H -#undef HAVE_SYS_TIMEB_H -#undef HAVE_SYS_TIME_H -#undef HAVE_UNISTD_H -#undef HAVE_UTIME_H -#undef HAVE_LINUX_VERSION_H -#undef HAVE_SYS_SYSTEMINFO_H -#undef HAVE_TERMIOS_H -#undef HAVE_STRINGS_H -#undef HAVE_PWD_H +/* Define to 1 if the type of the st_atim member of a struct stat is struct + timespec. */ +#undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC -#undef HAVE_LIBDNET -#undef HAVE_LIBPTHREADS -#undef HAVE_LIBRESOLV -#undef HAVE_LIBXMU +/* Define to 1 for Encore UMAX. */ +#undef UMAX -/* movemail Kerberos support */ -/* libraries */ -#undef HAVE_LIBKRB -#undef HAVE_LIBKRB4 -#undef HAVE_LIBDES -#undef HAVE_LIBDES425 -#undef HAVE_LIBKRB5 -#undef HAVE_LIBCRYPTO -#undef HAVE_LIBCOM_ERR -/* header files */ -#undef HAVE_KRB5_H -#undef HAVE_DES_H -#undef HAVE_KRB_H -#undef HAVE_KERBEROSIV_DES_H -#undef HAVE_KERBEROSIV_KRB_H -#undef HAVE_KERBEROS_DES_H -#undef HAVE_KERBEROS_KRB_H -#undef HAVE_COM_ERR_H +/* Define to 1 for Encore UMAX 4.3 that has instead of + . */ +#undef UMAX4_3 -/* Mail-file locking */ -#undef HAVE_LIBMAIL -#undef HAVE_MAILLOCK_H -#undef HAVE_TOUCHLOCK +/* Define to 1 if using GTK. */ +#undef USE_GTK -#undef HAVE_ALLOCA_H +/* Define to 1 if using the Lucid X toolkit. */ +#undef USE_LUCID -#undef HAVE_GETTIMEOFDAY -/* If we don't have gettimeofday, - the test for GETTIMEOFDAY_ONE_ARGUMENT may succeed, - but we should ignore it. */ -#ifdef HAVE_GETTIMEOFDAY -#undef GETTIMEOFDAY_ONE_ARGUMENT -#endif -#undef HAVE_GETHOSTNAME -#undef HAVE_DUP2 -#undef HAVE_RENAME -#undef HAVE_CLOSEDIR +/* Define to use mmap to allocate buffer text. */ +#undef USE_MMAP_FOR_BUFFERS -#undef TM_IN_SYS_TIME -#undef HAVE_TM_ZONE +/* Define to 1 if using the Motif X toolkit. */ +#undef USE_MOTIF -/* Define to 1 if you don't have `tm_zone' but do have the external array - `tzname'. */ -#define HAVE_TZNAME 1 +/* Define to 1 if we should use toolkit scroll bars. */ +#define USE_TOOLKIT_SCROLL_BARS 1 -/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. - */ -#define HAVE_DECL_TZNAME 1 +/* Define to 1 if we should use XIM, if it is available. */ +#undef USE_XIM -#undef const +/* Define to 1 if using an X toolkit. */ +#undef USE_X_TOOLKIT -#undef HAVE_LONG_FILE_NAMES +/* Define for USG systems where it works to open a pty's tty in the parent + process, then close and reopen it in the child. */ +#undef USG_SUBTTY_WORKS -#undef CRAY_STACKSEG_END +/* Version number of package */ +#define VERSION "24.1.50" -#undef HAVE_XRMSETDATABASE -#undef HAVE_XSCREENRESOURCESTRING -#undef HAVE_XSCREENNUMBEROFSCREEN +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'wchar_t'. */ +#undef WCHAR_T_SUFFIX -#undef HAVE_MKDIR -#undef HAVE_RMDIR -#undef HAVE_RANDOM -#undef HAVE_LRAND48 -#undef HAVE_LOGB -#undef HAVE_FREXP -#undef HAVE_FMOD -#undef HAVE_RINT -#undef HAVE_CBRT -#undef HAVE_RES_INIT /* For -lresolv on Suns. */ -#undef HAVE_SETSID -#undef HAVE_FPATHCONF -#undef HAVE_SELECT -#undef HAVE_EUIDACCESS -#undef HAVE_GETPAGESIZE -#undef HAVE_GET_CURRENT_DIR_NAME -#undef HAVE_TZSET -#undef HAVE_SETLOCALE -#undef HAVE_UTIMES -#undef HAVE_SETRLIMIT -#undef HAVE_SETPGID -/* If you think about defining HAVE_GETCWD, don't: the alternative - getwd is redefined on w32.c, and does not really return the current - directory, to get the desired results elsewhere in Emacs */ -#undef HAVE_GETCWD -#undef HAVE_SHUTDOWN -#undef HAVE_STRFTIME -/* Standard Windows strftime does not support POSIX.2 extensions. */ -#define STRFTIME_NO_POSIX2 1 +/* Use long long for EMACS_INT if available. */ +/* #undef WIDE_EMACS_INT */ -#define HAVE_SENDTO 1 -#define HAVE_RECVFROM 1 -#define HAVE_GETSOCKNAME 1 -#define HAVE_GETPEERNAME 1 -#define HAVE_SNPRINTF 1 -#define HAVE_LANGINFO_CODESET 1 -/* Local (unix) sockets are not supported. */ -#undef HAVE_SYS_UN_H +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'wint_t'. */ +#undef WINT_T_SUFFIX -#define LOCALTIME_CACHE -#undef HAVE_INET_SOCKETS +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif -#undef HAVE_AIX_SMT_EXP +/* Define this to check for malloc buffer overrun. */ +#undef XMALLOC_OVERRUN_CHECK -/* Define if you have the ANSI `strerror' function. - Otherwise you must have the variable `char *sys_errlist[]'. */ -#undef HAVE_STRERROR +/* Define to the type of the 6th arg of XRegisterIMInstantiateCallback, either + XPointer or XPointer*. */ +#undef XRegisterIMInstantiateCallback_arg6 -/* Define if `sys_siglist' is declared by . */ -#undef SYS_SIGLIST_DECLARED +/* Enable large inode numbers on Mac OS X. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif -/* Define if `struct utimbuf' is declared by . */ -#undef HAVE_STRUCT_UTIMBUF +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS -/* Define if `struct timeval' is declared by . */ -#undef HAVE_TIMEVAL +/* enable compile-time and run-time bounds-checking, and some warnings */ +#undef _FORTIFY_SOURCE -/* Define to 1 if you have the header file. */ -#undef HAVE_GETOPT_H +/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct + stat.st_size becomes 64-bit. */ +#undef _GL_WINDOWS_64_BIT_ST_SIZE -/* Define to 1 if you have the `getopt_long_only' function. */ -#undef HAVE_GETOPT_LONG_ONLY +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +#undef _LARGEFILE_SOURCE -/* Preprocessor macros needed for gnulib imports. */ +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES -/* Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works. */ -#ifdef __GNUC__ -#define HAVE_ATTRIBUTE_ALIGNED 1 -#else -#undef HAVE_ATTRIBUTE_ALIGNED -#endif +/* Define to 1 if on MINIX. */ +#undef _MINIX -/* Define to 1 if strtold conforms to C99. */ -#ifdef __GNUC__ -#define HAVE_C99_STRTOLD 1 -#else -#undef HAVE_C99_STRTOLD +/* Define if GNUstep uses ObjC exceptions. */ +#undef _NATIVE_OBJC_EXCEPTIONS + +/* The _Noreturn keyword of C11. */ +#if ! (defined _Noreturn \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) +# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__)) +# define _Noreturn __attribute__ ((__noreturn__)) +# elif defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn +# endif #endif -/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. - */ -#define HAVE_DECL_GETENV 1 -/* Define to 1 if you have the declaration of `localtime_r', and to 0 if you - don't. */ -#undef HAVE_DECL_LOCALTIME_R +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R +/* Define to 1 if you need to in order for 'stat' and other things to work. */ +#undef _POSIX_SOURCE -/* Define to 1 if you have the declaration of `strtoll', and to 0 if you - don't. */ -#define HAVE_DECL_STRTOLL 1 +/* Needed for system_process_attributes on Solaris. */ +#undef _STRUCTURED_PROC -/* Define to 1 if you have the declaration of `strtoull', and to 0 if you - don't. */ -#define HAVE_DECL_STRTOULL 1 +/* Define to 500 only on HP-UX. */ +#undef _XOPEN_SOURCE -/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you - don't. */ -#define HAVE_DECL_STRTOUMAX 1 +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on Mac OS X. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif -/* Define to 1 if you have the `strtoull' function. */ -#define HAVE_STRTOULL 1 -/* Define to 1 if you have the `strtoumax' function. */ -#define HAVE_STRTOUMAX 1 +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +#undef __GETOPT_PREFIX -/* Define if you have the 'wchar_t' type. */ -#define HAVE_WCHAR_T 1 +/* Define to compiler's equivalent of C99 restrict keyword in array + declarations. Define as empty for no equivalent. */ +#undef __restrict_arr -/* Name of package */ -#define PACKAGE "emacs" +/* Define to the used os dependent file. */ +#define config_opsysfile "s/ms-w32.h" -/* Version number of package */ -#define VERSION "24.1.50" +/* A replacement for va_copy, if needed. */ +#define gl_va_copy(a,b) ((a) = (b)) -/* The type of system you are compiling for; sets `system-type'. */ -#define SYSTEM_TYPE "windows-nt" +/* Define to rpl_gmtime if the replacement function should be used. */ +#undef gmtime /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ -#ifdef __GNUC__ #ifndef __cplusplus #undef inline #endif -#else /* MSVC */ -#define inline __inline + +/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports + the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of + earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. + __APPLE__ && __MACH__ test for Mac OS X. + __APPLE_CC__ tests for the Apple compiler and its version. + __STDC_VERSION__ tests for the C99 mode. */ +#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ +# define __GNUC_STDC_INLINE__ 1 #endif +/* Define to 1 if the compiler is checking for lint. */ +#undef lint + +/* Define to rpl_localtime if the replacement function should be used. */ +#undef localtime + +/* Define to a type if does not define. */ +#undef mbstate_t + +/* Define to `int' if does not define. */ +#undef mode_t + +/* Define to the name of the strftime replacement function. */ +#define my_strftime nstrftime + +/* Define to the type of st_nlink in struct stat, or a supertype. */ +#define nlink_t short + +/* Define to `int' if does not define. */ +#undef pid_t + /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is supported directly. */ -#ifdef __GNUC__ -# define restrict __restrict__ -#else -# define restrict +#undef restrict +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ +#if defined __SUNPRO_CC && !defined __RESTRICT +# define _Restrict +# define __restrict__ #endif -/* `mode_t' is not defined for MSVC. Define. */ -#ifdef _MSC_VER -typedef unsigned short mode_t; -#endif +/* type to use in place of socklen_t if not defined */ +#undef socklen_t -/* A va_copy replacement for MSVC. */ -#ifdef _MSC_VER -# ifdef _WIN64 -# ifndef va_copy /* Need to be checked (?) */ -# define va_copy(d,s) ((d) = (s)) -# endif -# else /* not _WIN64 */ -# define va_copy(d,s) ((d) = (s)) -# endif /* not _WIN64 */ -#endif /* _MSC_VER */ +/* Define as a signed type of the same size as size_t. */ +#undef ssize_t + +/* Define to any substitute for sys_siglist. */ +#undef sys_siglist /* Define as a marker that can be attached to declarations that might not be used. This helps to reduce warnings, such as from @@ -352,146 +1412,128 @@ typedef unsigned short mode_t; is a misnomer outside of parameter lists. */ #define _UNUSED_PARAMETER_ _GL_UNUSED -/* End of gnulib-related stuff. */ - -#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ -#define NO_INLINE __attribute__((noinline)) -#else -#define NO_INLINE -#endif - -#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) -#define EXTERNALLY_VISIBLE __attribute__((externally_visible)) -#else -#define EXTERNALLY_VISIBLE -#endif - -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +/* The __pure__ attribute was added in gcc 2.96. */ +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) #else -# define ATTRIBUTE_FORMAT(spec) /* empty */ +# define _GL_ATTRIBUTE_PURE /* empty */ #endif -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) -# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) +/* The __const__ attribute was added in gcc 2.95. */ +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) #else -# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) -#endif - -#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) -#define HAVE___BUILTIN_UNWIND_INIT 1 +# define _GL_ATTRIBUTE_CONST /* empty */ #endif -#undef EMACS_CONFIGURATION -#undef EMACS_CONFIG_OPTIONS +/* Define as a macro for copying va_list variables. */ +#undef va_copy -/* The configuration script defines opsysfile to be the name of the - s/SYSTEM.h file that describes the system type you are using. The file - is chosen based on the configuration name you give. +/* Define as `fork' if `vfork' does not work. */ +#undef vfork - 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/SYSTEM.h files. */ -#undef config_opsysfile -#include "s/ms-w32.h" +/* Define AMPERSAND_FULL_NAME if you use the convention + that & in the full name stands for the login id. */ +#undef AMPERSAND_FULL_NAME -/* Define `subprocesses' should be defined if you want to +/* `subprocesses' should be defined if you want to have code for asynchronous subprocesses (as used in M-x compile and M-x shell). - Only MSDOS does not support this. */ + Only MSDOS does not support this (it overrides + this in its config_opsysfile below). */ #define subprocesses -/* Define STACK_DIRECTION here, but not if m/foo.h did. */ -#ifndef STACK_DIRECTION -#undef STACK_DIRECTION +/* Include the os dependent file. */ +#ifdef config_opsysfile +# include config_opsysfile +#endif + +/* GNUstep needs a bit more pure memory. Of the existing knobs, + SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. + (There is probably a better place to do this, but right now the + Cocoa side does this in s/darwin.h and we cannot parallel this + exactly since GNUstep is multi-OS. */ +#if defined HAVE_NS && defined NS_IMPL_GNUSTEP +# define SYSTEM_PURESIZE_EXTRA 30000 #endif #ifdef emacs /* Don't do this for lib-src. */ /* Tell regex.c to use a type compatible with Emacs. */ #define RE_TRANSLATE_TYPE Lisp_Object #define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C) -#define RE_TRANSLATE_P(TBL) (XFASTINT (TBL) != 0) +#ifdef make_number +/* If make_number is a macro, use it. */ +#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0))) +#else +/* If make_number is a function, avoid it. */ +#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0)) #endif - -#define my_strftime nstrftime /* for strftime.c */ - -/* Define to the type of st_nlink in struct stat, or a supertype. */ -#define nlink_t short - -#ifndef WINDOWSNT -/* Some of the files of Emacs which are intended for use with other - programs assume that if you have a config.h file, you must declare - the type of getenv. */ -extern char *getenv (); #endif -#endif /* EMACS_CONFIG_H */ - -#if defined (__MINGW32__) || _MSC_VER >= 1400 - -/* Define to 1 if the system has the type `long long int'. */ -# define HAVE_LONG_LONG_INT 1 - -/* Define to 1 if the system has the type `unsigned long long int'. */ -# define HAVE_UNSIGNED_LONG_LONG_INT 1 - -#elif _MSC_VER >= 1200 - -/* Temporarily disable wider-than-pointer integers until they're tested more. - Build with CFLAGS='-DWIDE_EMACS_INT' to try them out. */ -/* #undef WIDE_EMACS_INT */ +#include +#include -# ifdef WIDE_EMACS_INT +#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ +#define NO_INLINE __attribute__((noinline)) +#else +#define NO_INLINE +#endif -/* Use pre-C99-style 64-bit integers. */ -# define EMACS_INT __int64 -# define EMACS_INT_MAX _I64_MAX -# define pI "I64" +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) +#define EXTERNALLY_VISIBLE __attribute__((externally_visible)) +#else +#define EXTERNALLY_VISIBLE +#endif -# endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define ATTRIBUTE_FORMAT(spec) /* empty */ +#endif +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) +# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) +#else +# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) #endif -#ifndef POINTER_TYPE -#define POINTER_TYPE void +/* Some versions of GNU/Linux define noinline in their headers. */ +#ifdef noinline +#undef noinline #endif -#ifndef PROTOTYPES -#define PROTOTYPES 1 +/* These won't be used automatically yet. We also need to know, at least, + that the stack is continuous. */ +#ifdef __GNUC__ +# ifndef GC_SETJMP_WORKS + /* GC_SETJMP_WORKS is nearly always appropriate for GCC. */ +# define GC_SETJMP_WORKS 1 +# endif #endif -#include "string.h" -#ifdef HAVE_STRINGS_H -#include "strings.h" +/* Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works. */ +#ifdef __GNUC__ +#define HAVE_ATTRIBUTE_ALIGNED 1 #endif -#include -/* The _Noreturn keyword of C11. */ -#if ! (defined _Noreturn \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__)) -# define _Noreturn __attribute__ ((__noreturn__)) -# elif defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn -# endif +/* Define to 1 if strtold conforms to C99. */ +#ifdef __GNUC__ +#define HAVE_C99_STRTOLD 1 #endif -/* Redefine abort. */ -#ifdef HAVE_NTGUI -#define abort w32_abort -_Noreturn void w32_abort (void); +#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) +#define HAVE___BUILTIN_UNWIND_INIT 1 #endif -/* Prevent accidental use of features unavailable in - older Windows versions we still support. */ -#define _WIN32_WINNT 0x0400 +#endif /* EMACS_CONFIG_H */ -/* Make a leaner executable. */ -#define WIN32_LEAN_AND_MEAN 1 +/* +Local Variables: +mode: c +End: +*/ diff --git a/src/ChangeLog b/src/ChangeLog index ab5417f4ac4..bb9fabfaa8e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-07-06 Juanma Barranquero + Eli Zaretskii + + * s/ms-w32.h: Settings not specific to Windows moved to nt/config.nt. + Windows-specific code from nt/config.nt moved here. + Obsolete settings removed. + 2012-07-06 Paul Eggert * process.c: Avoid unnecessary calls to gettime. diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index f3d8b5ec472..866ffc9c048 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -27,6 +27,8 @@ along with GNU Emacs. If not, see . */ #define DOS_NT /* MSDOS or WINDOWSNT */ #endif +/* #undef const */ + /* If you are compiling with a non-C calling convention but need to declare vararg routines differently, put it here. */ #define _VARARGS_ __cdecl @@ -36,8 +38,6 @@ along with GNU Emacs. If not, see . */ convention must be whatever standard the libraries expect. */ #define _CALLBACK_ __cdecl -#define NO_MATHERR 1 - /* Letter to use in finding device name of first pty, if system supports pty's. 'a' means it is /dev/ptya0 */ #define FIRST_PTY_LETTER 'a' @@ -57,15 +57,19 @@ along with GNU Emacs. If not, see . */ for received packets, so datagrams are broken too. */ #define BROKEN_DATAGRAM_SOCKETS 1 -#define MAIL_USE_POP 1 +/* MSVC ignores the "register" keyword, so test fails even though + setjmp does work. */ +#define GC_SETJMP_WORKS 1 + +/* Enable conservative stack marking for GC. */ +#define GC_MARK_STACK 1 + #define MAIL_USE_SYSTEM_LOCK 1 /* If the character used to separate elements of the executable path is not ':', #define this to be the appropriate character constant. */ #define SEPCHAR ';' -#define ORDINARY_LINK 1 - /* ============================================================ */ /* Here, add any special hacks needed to make Emacs work on this @@ -81,6 +85,46 @@ along with GNU Emacs. If not, see . */ #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) +#ifdef __GNUC__ +#ifndef __cplusplus +#undef inline +#endif +#else /* MSVC */ +#define inline __inline +#endif + +#ifdef __GNUC__ +# define restrict __restrict__ +#else +# define restrict +#endif + +/* `mode_t' is not defined for MSVC. Define. */ +#ifdef _MSC_VER +typedef unsigned short mode_t; +#endif + +/* A va_copy replacement for MSVC. */ +#ifdef _MSC_VER +# ifdef _WIN64 +# ifndef va_copy /* Need to be checked (?) */ +# define va_copy(d,s) ((d) = (s)) +# endif +# else /* not _WIN64 */ +# define va_copy(d,s) ((d) = (s)) +# endif /* not _WIN64 */ +#endif /* _MSC_VER */ + +#ifndef WINDOWSNT +/* Some of the files of Emacs which are intended for use with other + programs assume that if you have a config.h file, you must declare + the type of getenv. */ +extern char *getenv (); +#endif + +#ifdef HAVE_STRINGS_H +#include "strings.h" +#endif #include #ifdef _MSC_VER @@ -104,79 +148,11 @@ struct sigaction { #define MAXPATHLEN _MAX_PATH #endif -#define HAVE_SOUND 1 - -#define HAVE_SYS_TIMEB_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_UNISTD_H 1 -#undef HAVE_UTIME_H -#undef HAVE_LINUX_VERSION_H -#undef HAVE_SYS_SYSTEMINFO_H -#define HAVE_PWD_H 1 -#define TIME_WITH_SYS_TIME 1 - -#define HAVE_GETTIMEOFDAY 1 -#define HAVE_GETHOSTNAME 1 -#define HAVE_DUP2 1 -#define HAVE_RENAME 1 -#define HAVE_CLOSEDIR 1 -#define HAVE_FSYNC 1 /* fsync is called _commit in MSVC. */ - -#undef TM_IN_SYS_TIME -#undef HAVE_TM_ZONE - -#define HAVE_LONG_FILE_NAMES 1 - -#define HAVE_MKDIR 1 -#define HAVE_RMDIR 1 -#define HAVE_RANDOM 1 -#undef HAVE_SYSINFO -#undef HAVE_LRAND48 -#define HAVE_LOGB 1 -#define HAVE_FREXP 1 -#define HAVE_FMOD 1 -#undef HAVE_RINT -#undef HAVE_CBRT -#undef HAVE_RES_INIT /* For -lresolv on Suns. */ -#undef HAVE_SETSID -#undef HAVE_FPATHCONF -#define HAVE_SELECT 1 -#undef HAVE_EUIDACCESS -#define HAVE_GETPAGESIZE 1 -#define HAVE_TZSET 1 -#define HAVE_SETLOCALE 1 -#undef HAVE_UTIMES -#undef HAVE_SETRLIMIT -#undef HAVE_SETPGID -/* If you think about defining HAVE_GETCWD, don't: the alternative - getwd is redefined on w32.c, and does not really return the current - directory, to get the desired results elsewhere in Emacs */ -#undef HAVE_GETCWD -#define HAVE_SHUTDOWN 1 - -#define LOCALTIME_CACHE -#define HAVE_INET_SOCKETS 1 - -#undef HAVE_AIX_SMT_EXP -#define USE_TOOLKIT_SCROLL_BARS 1 - /* MinGW has these in its library; MSVC doesn't. */ #ifdef _MSC_VER #define strcasecmp(s1,s2) _stricmp(s1,s2) #define strncasecmp(s1,s2) _strnicmp(s1,s2) #endif -#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1 - -/* Define if you have the ANSI `strerror' function. - Otherwise you must have the variable `char *sys_errlist[]'. */ -#define HAVE_STRERROR 1 - -/* Define if `struct utimbuf' is declared by . */ -#undef HAVE_STRUCT_UTIMBUF - -#define HAVE_MOUSE 1 -#define HAVE_H_ERRNO 1 #ifdef HAVE_NTGUI #define HAVE_WINDOW_SYSTEM 1 @@ -354,6 +330,13 @@ extern char *get_emacs_configuration_options (void); #define _WINSOCKAPI_ 1 #define _WINSOCK_H +/* Prevent accidental use of features unavailable in + older Windows versions we still support. */ +#define _WIN32_WINNT 0x0400 + +/* Make a leaner executable. */ +#define WIN32_LEAN_AND_MEAN 1 + /* Defines size_t and alloca (). */ #ifdef emacs #define malloc e_malloc @@ -367,6 +350,16 @@ extern char *get_emacs_configuration_options (void); #include #endif +/* stdlib.h must be included after redefining malloc & friends, but + before redefining abort. Isn't library redefinition funny? */ +#include + +/* Redefine abort. */ +#ifdef HAVE_NTGUI +#define abort w32_abort +extern _Noreturn void w32_abort (void); +#endif + #include /* Define for those source files that do not include enough NT system files. */ @@ -379,14 +372,36 @@ extern char *get_emacs_configuration_options (void); #endif /* For proper declaration of environ. */ -#include #ifndef sys_nerr #define sys_nerr _sys_nerr #endif -#include extern int getloadavg (double *, int); +#if defined (__MINGW32__) || _MSC_VER >= 1400 + +/* Define to 1 if the system has the type `long long int'. */ +# define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if the system has the type `unsigned long long int'. */ +# define HAVE_UNSIGNED_LONG_LONG_INT 1 + +#elif _MSC_VER >= 1200 + +/* Temporarily disable wider-than-pointer integers until they're tested more. + Build with CFLAGS='-DWIDE_EMACS_INT' to try them out. */ + +# ifdef WIDE_EMACS_INT + +/* Use pre-C99-style 64-bit integers. */ +# define EMACS_INT __int64 +# define EMACS_INT_MAX _I64_MAX +# define pI "I64" + +# endif + +#endif + /* We need a little extra space, see ../../lisp/loadup.el. */ #define SYSTEM_PURESIZE_EXTRA 50000 @@ -424,5 +439,4 @@ extern void _DebPrint (const char *fmt, ...); #define DebPrint(stuff) #endif - /* ============================================================ */