-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* The number of bytes in a usigned char. */
-#undef SIZEOF_CHAR
-
-/* The number of bytes in a unsigned int. */
-#undef SIZEOF_INT
-
-/* The number of bytes in a unsigned long. */
-#undef SIZEOF_LONG
-
-/* The number of bytes in a unsigned short. */
-#undef SIZEOF_SHORT
-
-/* Define if we have libgpm. */
-#undef HAVE_LIBGPM
-
-/* Define if we have the SLang library from Davis. */
-#undef HAVE_LIBSLANG
-
-/* Define if we have the X11 windowing system. */
-#undef HAVE_X11
-
-/* Define the architecture name string */
-#undef ARCHITECTURE
-
-/* 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
+/* Define if your processor stores words with the most significant
+ 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 unsigned int. */
+#undef SIZEOF_INT
+
+/* The number of bytes in a unsigned long. */
+#undef SIZEOF_LONG
+
+/* The number of bytes in a unsigned short. */
+#undef SIZEOF_SHORT
+
+/* 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 sys/mount.h */
+#undef HAVE_MOUNT_H
+
+/* Define if we have enabled pthread support */
+#undef HAVE_PTHREAD
+
+/* If there is no socklen_t, define this for the netdb shim */
+#undef NEED_SOCKLEN_T_DEFINE
+
+/* Define the cpu name string */
+#undef COMMON_CPU
+
+/* Define the on name string */
+#undef COMMON_OS
+
+/* The version number string */
+#undef VERSION
+
+/* The package name string */
+#undef PACKAGE