xemacs-beta: src/config.h.in comparison

comparison src/config.h.in @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	966663fcf606
children	ca9a9ec9c1c1

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 AIX requires this to be the first thing in the file.  */
 #undef HAVE_ALLOCA_H
 #ifndef NOT_C_CODE
 #ifdef __GNUC__
-#undef  alloca
 #define alloca __builtin_alloca
+#elif HAVE_ALLOCA_H
+#include <alloca.h>
 #elif defined(_AIX)
 #pragma alloca
-#elif HAVE_ALLOCA_H
+#elif ! defined (alloca)
-#include <alloca.h>
+char *alloca();
 #endif
-#endif /* NOT C */
+#endif /* C code */
 /* 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
+#define XEMACS 1
 /* Allow s&m files to differentiate OS versions without having
 multiple files to maintain. */
 #undef OS_RELEASE
 #undef HAVE_MMAP
 #undef HAVE_STRCOLL
 #undef HAVE_GETPGRP
 #undef GETPGRP_VOID
-#undef SIZEOF_SHORT
-#undef SIZEOF_INT
-#undef SIZEOF_LONG
-#undef SIZEOF_LONG_LONG
-#undef SIZEOF_VOID_P
 #undef HAVE_INVERSE_HYPERBOLIC
 #undef HAVE_CBRT
 #undef HAVE_CLOSEDIR
 #undef HAVE_NCURSES
 /* Full #include file paths for ncurses' curses.h and term.h. */
 #undef CURSES_H_PATH
 #undef TERM_H_PATH
-#define LOWTAGS
 /* Define USE_ASSERTIONS if you want the abort() to be changed to assert().
 If the assertion fails, assert_failed() will be called.  This is
 recommended for general use because it gives more info about the crash
 than just the abort() message.  Too many people "Can't find the corefile"
 or have limit-ed core dumps out of existence. */
 /* Debugging option: Don't automatically rebuild the DOC file.
 This saves a lot of time when you're repeatedly
 compiling-running-crashing. */
 #undef NO_DOC_FILE
-/* To eliminate use of `const' in the XEmacs sources,
+/* Defined by AC_C_CONST in configure.in */
-do `#define CONST_IS_LOSING' */
+#undef const
-#undef CONST_IS_LOSING
+#define CONST const
-# undef CONST
-# ifdef CONST_IS_LOSING
+/* If defined, use unions instead of ints.  A few systems (DEC Alpha)
-#  define CONST
-# else
-#  define CONST const
-# endif /* 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.
+definitions isn't right with 64-bit systems.  */
+#undef USE_UNION_TYPE
-(It's NO_UNION_TYPE instead of USE_UNION_TYPE for historical reasons.) */
-#undef NO_UNION_TYPE
-/* The next two options are turned on by --with-gung=yes */
 /* If defined, use a minimal number of tagbits.  This allows usage of more
 advanced versions of malloc (like the Doug Lea new GNU malloc) and larger
 integers. */
+/* --use-minimal-tagbits  */
 #undef USE_MINIMAL_TAGBITS
-/* #### Document me. */
+/* --use-indexed-lrecord-implementation  */
 #undef USE_INDEXED_LRECORD_IMPLEMENTATION
 /* 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.
 #if defined (__cplusplus) && !defined (NOT_C_CODE)
 extern "C" {
 #endif
 #undef config_opsysfile
 #include config_opsysfile
-#if defined (__cplusplus) && !defined (NOT_C_CODE)
-}
-#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.
 configuration names to use for them.
 See m/template.h for documentation on writing m/...h files. */
 #undef config_machfile
 #include config_machfile
+#if defined (__cplusplus) && !defined (NOT_C_CODE)
+}
+#endif
 #if defined (USE_SYSTEM_MALLOC) && !defined (SYSTEM_MALLOC)
 #define SYSTEM_MALLOC
 #endif
 #if defined (MULE) || defined (DEBUG_ENCAPSULATION)
 # define ENCAPSULATE_CHDIR
 # define ENCAPSULATE_MKDIR
 # define ENCAPSULATE_OPENDIR
+# define ENCAPSULATE_CLOSEDIR
 # define ENCAPSULATE_READDIR
 # define ENCAPSULATE_RMDIR
 /* file-information calls */
 #define connect Rconnect
 #define getsockname Rgetsockname
 #define listen Rlisten
 #endif /* HAVE_SOCKS && !DO_NOT_SOCKSIFY */
-#ifndef SHORTBITS
+#undef SIZEOF_SHORT
-#define SHORTBITS (8 * SIZEOF_SHORT)
+#undef SIZEOF_INT
-#endif
+#undef SIZEOF_LONG
-#ifndef INTBITS
+#undef SIZEOF_LONG_LONG
-#define INTBITS (8 * SIZEOF_INT)
+#undef SIZEOF_VOID_P
-#endif
-#ifndef LONGBITS
+#ifndef BITS_PER_CHAR
-#define LONGBITS (8 * SIZEOF_LONG)
+#define BITS_PER_CHAR 8
 #endif
+#define SHORTBITS (SIZEOF_SHORT * BITS_PER_CHAR)
+#define INTBITS (SIZEOF_INT * BITS_PER_CHAR)
+#define LONGBITS (SIZEOF_LONG * BITS_PER_CHAR)
+#define LONG_LONG_BITS (SIZEOF_LONG_LONG * BITS_PER_CHAR)
+#define VOID_P_BITS (SIZEOF_VOID_P * BITS_PER_CHAR)
 #ifndef NOT_C_CODE
+#ifdef __cplusplus
+#define HAVE_INLINE 1
+#define INLINE inline
+#else /* not C++ */
 /* Does the keyword `inline' exist?  */
 #undef HAVE_INLINE
 #undef inline
 # ifdef HAVE_INLINE
 #   define INLINE static inline
 #  endif /* __GNUC__ */
 # else
 #  define INLINE static
 # endif /* HAVE_INLINE */
+#endif /* not C++ */
 #endif /* C code */
+#if defined (__cplusplus) && !defined (NOT_C_CODE)
+/* 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++ */
+/* Strictly speaking, only int or unsigned int are valid types in a
+bitfield.  In practice, we would like to use enums as bitfields.
+The following should just result in warning avoidance:
+warning: nonportable bit-field type */
+#if !(defined (__SUNPRO_C) && __STDC__ == 1)
+#define enum_field(enumeration_type) enum enumeration_type
+#else
+#define enum_field(enumeration_type) unsigned int
+#endif
 /* We want to avoid saving the signal mask if possible, because
 that necessitates a system call. */
 #ifdef HAVE_SIGSETJMP
 # define SETJMP(x) sigsetjmp (x, 0)

Mercurial > hg > xemacs-beta

comparison src/config.h.in @ 272:c5d627a313b1 r21-0b34