merged from debian-sid

[apt.git] / buildlib / config.h.in

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 2c98a11ac6ae2603b67c47b57d8dec79dd9cdca7..eddb162469aa8025cc2a5d1d874cb9efff9439c9 100644 (file)
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -2,6 +2,8 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

+/* The following 4 are only used by inttypes.h shim if the system lacks
+   inttypes.h */

 /* The number of bytes in a usigned char.  */
 #undef SIZEOF_CHAR
 
 /* The number of bytes in a usigned char.  */
 #undef SIZEOF_CHAR
 


@@ -14,58 +16,27 @@
 /* The number of bytes in a unsigned short.  */
 #undef SIZEOF_SHORT
 
 /* The number of bytes in a unsigned short.  */
 #undef SIZEOF_SHORT
 

-/* Define if we have libgpm. */
-#undef HAVE_LIBGPM
+/* Define if we have the timegm() function */
+#undef HAVE_TIMEGM

 
 

-/* Define if we have the SLang library from Davis. */
-#undef HAVE_LIBSLANG    
+/* These two are used by the statvfs shim for glibc2.0 and bsd */
+/* Define if we have sys/vfs.h */
+#undef HAVE_VFS_H

 
 

-/* Define if we have the X11 windowing system. */
-#undef HAVE_X11
+/* Define if we have sys/mount.h */
+#undef HAVE_MOUNT_H

 
 /* Define if we have enabled pthread support */
 #undef HAVE_PTHREAD
 
 
 /* Define if we have enabled pthread support */
 #undef HAVE_PTHREAD
 

-/* Define the architecture name string */
-#undef ARCHITECTURE
+/* If there is no socklen_t, define this for the netdb shim */
+#undef NEED_SOCKLEN_T_DEFINE
+
+/* Define the arch name string */
+#undef COMMON_ARCH

 
 /* The version number string */
 #undef VERSION
 
 /* The package name string */
 #undef PACKAGE
 
 /* The version number string */
 #undef VERSION
 
 /* The package name string */
 #undef PACKAGE

-
-/* Generate the fixed bit size types */
-#if SIZEOF_INT == 4
-# define INT32 int
-# define UINT32 unsigned int
-#else
-# if SIZEOF_LONG == 4
-#  define INT32 long
-#  define UINT32 unsigned long
-# else
-#  if SIZEOF_SHORT == 4
-#   define INT32 short
-#   define UINT32 unsigned short
-#  else
-#   error Must have a form of 32-bit integer
-#  endif
-# endif
-#endif
-
-#if SIZEOF_INT == 2
-# define INT16 int
-# define UINT16 unsigned int
-#else
-# if SIZEOF_LONG == 2
-#  define INT16 long
-#  define UINT16 unsigned long
-# else
-#  if SIZEOF_SHORT == 2
-#   define INT16 short
-#   define UINT16 short
-#  else
-#   error Must have a form of 16-bit integer
-#  endif
-# endif
-#endif