/* These are from config.h.bot, pasted onto the end of config.h.in. */
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#if SIZEOF_UNSIGNED_LONG_LONG==8
+typedef unsigned long long uint64_t;
+#elif SIZEOF_UNSIGNED_LONG==8
+typedef unsigned long uint64_t;
+#else
+#error I do not know what to use for a uint64_t.
#endif
-#if 0
-/* Use the definitions: */
-
/* Give us an unsigned 32-bit data type. */
#if SIZEOF_UNSIGNED_LONG==4
-#define UWORD32 unsigned long
+typedef unsigned long uint32_t;
#elif SIZEOF_UNSIGNED_INT==4
-#define UWORD32 unsigned int
+typedef unsigned int uint32_t;
+#else
+#error I do not know what to use for a uint32_t.
+#endif
+
+/* An unsigned 16-bit data type. */
+#if SIZEOF_UNSIGNED_INT==2
+typedef unsigned int uint16_t;
+#elif SIZEOF_UNSIGNED_SHORT==2
+typedef unsigned short uint16_t;
#else
-#error I do not know what to use for a UWORD32.
+#error I do not know what to use for a uint16_t.
#endif
/* An unsigned 8-bit data type */
#if SIZEOF_UNSIGNED_CHAR==1
-#define UBYTE8 unsigned char
+typedef unsigned char uint8_t;
#else
-#error I do not know what to use for a UBYTE8
+#error I do not know what to use for a uint8_t.
+#endif
+#endif
#endif
-
-#endif /* 0 */
-
+#ifndef HAVE_SNPRINTF
+#include <stdio.h>
+#include <stdarg.h>
+#include "snprintf.h"
+#endif
#endif /* _CONFIG_H */