X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=nt%2Fconfig.h;h=78f8e6c876fd9a7369fd5560fbb3150ad8acb991;hp=a10ff2e8903863773a4728a80cedf3f3f63e917f;hb=3ddd5d42503cc3567ef598bba0cbd86d256ec0fa;hpb=35adcaaeafb1fe93eaf00c39b48619e8f188ff3f diff --git a/nt/config.h b/nt/config.h index a10ff2e..78f8e6c 100644 --- a/nt/config.h +++ b/nt/config.h @@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.30 (more or less). */ /* No code in XEmacs #includes config.h twice, but some of the code - intended to work with other packages as well (like gmalloc.c) + intended to work with other packages as well (like gmalloc.c) think they can include it as many times as they like. */ #ifndef _SRC_CONFIG_H_ #define _SRC_CONFIG_H_ @@ -67,12 +67,6 @@ Boston, MA 02111-1307, USA. */ numbers. */ #undef LISP_FLOAT_TYPE -/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */ -#define GNU_MALLOC - -/* Define USE_SYSTEM_MALLOC if you forcing the use of it. */ -#undef USE_SYSTEM_MALLOC - /* Define HAVE_TTY if you want TTY support compiled in. */ #undef HAVE_TTY @@ -98,8 +92,8 @@ Boston, MA 02111-1307, USA. */ #define FUNCPROTO 15 #endif -/* Define this if you're using XFree386. */ -#undef HAVE_XFREE386 +#define HAVE_XREGISTERIMINSTANTIATECALLBACK +#undef XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE #undef THIS_IS_X11R4 #undef THIS_IS_X11R5 @@ -154,17 +148,14 @@ Boston, MA 02111-1307, USA. */ /* Some things figured out by the configure script, grouped as they are in configure.in. */ #undef HAVE_MACH_MACH_H -#undef HAVE_SYS_STROPTS_H #undef HAVE_SYS_TIMEB_H #undef HAVE_UNISTD_H -#undef HAVE_UTIME_H #undef HAVE_SYS_WAIT_H #undef HAVE_LIBGEN_H -#undef HAVE_LINUX_VERSION_H #undef WORDS_BIGENDIAN #undef TIME_WITH_SYS_TIME -#define HAVE_SYS_TIME_H +#undef HAVE_SYS_TIME_H #define HAVE_LOCALE_H #ifdef HAVE_X_WINDOWS #define HAVE_X11_LOCALE_H @@ -183,9 +174,6 @@ Boston, MA 02111-1307, USA. */ /* Define if `sys_siglist' is declared by . */ #undef SYS_SIGLIST_DECLARED -/* Define if `struct utimbuf' is declared by . */ -#undef HAVE_STRUCT_UTIMBUF - /* Define if `struct timeval' is declared by . */ #define HAVE_TIMEVAL @@ -237,7 +225,10 @@ Boston, MA 02111-1307, USA. */ #undef HAVE_FREXP #undef HAVE_FTIME #undef HAVE_GETHOSTNAME -#undef HAVE_GETPAGESIZE + +#define HAVE_GETPAGESIZE +#define getpagesize() 4096 + #define HAVE_GETTIMEOFDAY #define HAVE_GETWD #undef HAVE_LOGB @@ -261,11 +252,27 @@ Boston, MA 02111-1307, USA. */ #undef HAVE_SIGHOLD #undef HAVE_SIGPROCMASK #undef HAVE_SIGSETJMP -#undef HAVE_STRCASECMP #define HAVE_STRERROR #undef HAVE_TZSET +#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__GETPTY /* 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_STROPTS_H /* SysV streams */ +#undef HAVE_STRTIO_H /* SysV streams TIOCSIGNAL */ #define HAVE_SOCKETS #undef HAVE_SOCKADDR_SUN_LEN @@ -293,7 +300,7 @@ Boston, MA 02111-1307, USA. */ /* Define HAVE_BERKELEY_DB if you want to use the BerkDB libraries */ #undef HAVE_BERKELEY_DB /* Full #include file path for Berkeley DB's db.h */ -#undef DB_H_PATH +#undef DB_H_FILE #if defined (HAVE_DBM) || defined (HAVE_BERKELEY_DB) # define HAVE_DATABASE @@ -302,8 +309,8 @@ Boston, MA 02111-1307, USA. */ /* Define HAVE_NCURSES if -lncurses is present. */ #undef HAVE_NCURSES /* Full #include file paths for ncurses' curses.h and term.h. */ -#undef CURSES_H_PATH -#undef TERM_H_PATH +#undef CURSES_H_FILE +#undef TERM_H_FILE #define LOWTAGS @@ -336,6 +343,25 @@ Boston, MA 02111-1307, USA. */ #endif /* DEBUG_XEMACS */ +/* Define convenient conditionally defined assertion macros. */ +#ifdef ERROR_CHECK_TYPECHECK +#define type_checking_assert(assertion) assert (assertion) +#else +#define type_checking_assert(assertion) +#endif + +#ifdef ERROR_CHECK_BUFPOS +#define bufpos_checking_assert(assertion) assert (assertion) +#else +#define bufpos_checking_assert(assertion) +#endif + +#ifdef ERROR_CHECK_GC +#define gc_checking_assert(assertion) assert (assertion) +#else +#define gc_checking_assert(assertion) +#endif + /* Define MEMORY_USAGE_STATS if you want extra code compiled in to determine where XEmacs's memory is going. */ #undef MEMORY_USAGE_STATS @@ -412,8 +438,6 @@ Boston, MA 02111-1307, USA. */ compiling-running-crashing. */ #undef NO_DOC_FILE -#define CONST const - /* If not 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. @@ -476,7 +500,7 @@ Boston, MA 02111-1307, USA. */ #undef SUNPRO /* Sun SparcStations, SGI machines, and HP9000s700s have support for playing - different sound files as beeps. If you are on a SparcStation but do not + different sound files as beeps. If you are on a SparcStation but do not have the sound option installed for some reason, then undefine HAVE_NATIVE_SOUND. (It's usually found in /usr/demo/SOUND/ on SunOS 4 and Solaris systems; on Solaris, you may need to install the "SUNWaudmo" @@ -486,7 +510,7 @@ Boston, MA 02111-1307, USA. */ /* If you wish to compile with support for the Network Audio System system define HAVE_NAS_SOUND. - NAS_NO_ERROR_JUMP means that the NAS libraries don't inlcude some + NAS_NO_ERROR_JUMP means that the NAS libraries don't include some error handling changes. */ #undef HAVE_NAS_SOUND @@ -526,7 +550,7 @@ Boston, MA 02111-1307, USA. */ uses, mbstowcs() and wcstombs(), are unusable when programs are statically linked (as XEmacs must be) because the static version of libc.a contains the *dynamic* versions of these functions. These - functions don't seem to be called when XEmacs is running, so it's + functions don't seem to be called when XEmacs is running, so it's enough to define stubs for them. This appears to be fixed in SunOS 4.1.2. @@ -549,10 +573,8 @@ on various systems. */ #define ENCAPSULATE_OPEN #define ENCAPSULATE_FOPEN #define ENCAPSULATE_MKDIR - -#if defined (WIN32) && defined (USE_IME) -#define HAVE_FEP -#endif +#define ENCAPSULATE_STAT +#define ENCAPSULATE_FSTAT #if defined (HAVE_SOCKS) && !defined (DO_NOT_SOCKSIFY) #define accept Raccept @@ -573,11 +595,13 @@ on various systems. */ /* MSVC version >= 2.x without /Za supports __inline */ #if (_MSC_VER < 900) || defined(__STDC__) -# define INLINE static +# define inline #else -# define INLINE __inline +# define inline __inline #endif +#define INLINE_HEADER inline static + /* MSVC warnings no-no crap. When adding one to this section, 1. Think twice 2. Insert textual description of the warning. @@ -586,9 +610,28 @@ on various systems. */ /* 'expression' : signed/unsigned mismatch */ #pragma warning ( disable : 4018 ) +/* unnamed type definition in parentheses + (Martin added a pedantically correct definition of ALIGNOF, which + generates temporary anonymous structures, and MSVC complains) */ +#pragma warning ( disable : 4116 ) #endif /* compiler understands #pragma warning*/ +#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 +# define not c_not + +# define EXTERN_C extern "C" +# else /* C code */ +# define EXTERN_C extern +# endif +#endif /* C or C++ */ + #define enum_field(enumeration_type) unsigned int /* We want to avoid saving the signal mask if possible, because @@ -605,22 +648,14 @@ on various systems. */ /* movemail options */ /* Should movemail use POP3 for mail access? */ -#undef MAIL_USE_POP +/* #undef MAIL_USE_POP */ /* Should movemail use kerberos for POP authentication? */ #undef KERBEROS /* Should movemail use hesiod for getting POP server host? */ #undef HESIOD /* Determine type of mail locking. */ -/* Play preprocessor games so that configure options override s&m files */ -#undef REAL_MAIL_USE_LOCKF -#undef REAL_MAIL_USE_FLOCK -#undef MAIL_USE_LOCKF -#undef MAIL_USE_FLOCK -#ifdef REAL_MAIL_USE_FLOCK -#define MAIL_USE_FLOCK -#endif -#ifdef REAL_MAIL_USE_LOCKF -#define MAIL_USE_LOCKF -#endif +#undef MAIL_LOCK_LOCKF +#undef REAL_LOCK_FLOCK +#undef MAIL_LOCK_DOT #endif /* _SRC_CONFIG_H_ */