(enum fringe_bitmap_type): Define here.

[bpt/emacs.git] / src / config.in

diff --git a/src/config.in b/src/config.in
index fc8607b..628458c 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 /* No code in Emacs #includes config.h twice, but some bits of 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 EMACS_CONFIG_H
 #define EMACS_CONFIG_H
@@ -205,6 +205,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `grantpt' function. */
 #undef HAVE_GRANTPT
 
+/* Define to 1 if using GTK. */
+#undef HAVE_GTK
+
 /* Define to 1 if netdb.h declares h_errno. */
 #undef HAVE_H_ERRNO
 
@@ -238,6 +241,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <krb.h> header file. */
 #undef HAVE_KRB_H
 
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
 /* Define to 1 if you have the `com_err' library (-lcom_err). */
 #undef HAVE_LIBCOM_ERR
 
@@ -337,6 +343,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the `mbsinit' function. */
 #undef HAVE_MBSINIT
 
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
+
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
@@ -788,7 +797,6 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_CARBON
 #define HAVE_WINDOW_SYSTEM
 #define HAVE_MOUSE
-#define HAVE_MENUS
 #endif
 
 /* Define USER_FULL_NAME to return a string
@@ -961,7 +969,7 @@ char *alloca ();
 # endif /* HAVE_ALLOCA_H */
 #endif /* __GNUC__ */
 #ifndef HAVE_SIZE_T
-typedef size_t unsigned
+typedef unsigned size_t;
 #endif
 #endif /* NOT_C_CODE */
 
@@ -994,7 +1002,7 @@ typedef size_t unsigned
 #ifdef __GNUC__
 #  ifndef GC_SETJMP_WORKS
   /* GC_SETJMP_WORKS is nearly always appropriate for GCC --
-     see NON_SAVING_SETJMP in the target descriptions.  */   
+     see NON_SAVING_SETJMP in the target descriptions.  */
   /* Exceptions (see NON_SAVING_SETJMP in target description) are ns32k,
      SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86.
      Fixme: Deal with ns32k, SVR3.  */
@@ -1005,19 +1013,21 @@ typedef size_t unsigned
 #  endif
 #endif
 
-#ifndef HAVE_BCOPY
-#define bcopy(a,b,s) memcpy (b,a,s)
+/* avoid deprecated functions */
+#if HAVE_MEMCPY
+#  define bcopy(a,b,s) memcpy (b,a,s)
 #endif
-#ifndef HAVE_BZERO
-#define bzero(a,s) memset (a,0,s)
+#if HAVE_MEMSET
+#  define bzero(a,s) memset (a,0,s)
 #endif
-#ifndef HAVE_BCMP
-#define BCMP memcmp
+#if HAVE_MEMCMP
+#  define BCMP memcmp
+#  define bcmp memcmp
 #endif
 
 #endif /* EMACS_CONFIG_H */
 
-/* 
+/*
 Local Variables:
 mode: c
 End: