--- gvpe/config.h.in	2004/02/08 07:24:25	1.6
+++ gvpe/config.h.in	2005/03/18 01:53:05	1.9
@@ -27,6 +27,9 @@
 /* Select the digest algorithm to use. */
 #undef ENABLE_DIGEST
 
+/* DNS tunnel protocol support. */
+#undef ENABLE_DNS
+
 /* http proxy connect support. */
 #undef ENABLE_HTTP_PROXY
 
@@ -56,6 +59,9 @@
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
+/* Define to 1 if you have the <clocale> header file. */
+#undef HAVE_CLOCALE
+
 /* Cygwin */
 #undef HAVE_CYGWIN
 
@@ -90,6 +96,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `gmp' library (-lgmp). */
+#undef HAVE_LIBGMP
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
@@ -310,20 +319,33 @@
 #undef size_t
 
 
+typedef unsigned char u8;
+typedef signed char s8;
+
 #if __CYGWIN__
 
-typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned int u32;
+typedef signed short s16;
+typedef signed int s32;
 
 #else
 #include <inttypes.h>
 
 /* old modula-2 habits */
-typedef unsigned char u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
+typedef int16_t s16;
+typedef int32_t s32;
 #endif
 
 #endif
 
+// include clocale first because gettext.h might overwrite setlocale
+#if defined(HAVE_CLOCALE) && defined(__cplusplus)
+# include <clocale>
+#else
+# include <locale.h>
+#endif
+#include "gettext.h"
+