--- gvpe/config.h.in	2005/03/18 01:53:05	1.9
+++ gvpe/config.h.in	2007/03/29 17:35:20	1.12
@@ -288,7 +288,7 @@
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
@@ -306,7 +306,7 @@
 /* Version number of package */
 #undef VERSION
 
-/* Enable GNU extenstions */
+/* Enable GNU extensions */
 #undef _GNU_SOURCE
 
 /* Define to empty if `const' does not conform to ANSI C. */
@@ -315,7 +315,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 
@@ -341,11 +341,9 @@
 
 #endif
 
-// include clocale first because gettext.h might overwrite setlocale
-#if defined(HAVE_CLOCALE) && defined(__cplusplus)
-# include <clocale>
+#if HAVE_CLOCALE
+# define CLOCALE <clocale>
 #else
-# include <locale.h>
+# define CLOCALE <locale.h>
 #endif
-#include "gettext.h"