diff --git a/include/ChangeLog b/include/ChangeLog
index e1c1b6782..1d8167653 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-12  Kai Tietz   <kai.tietz@onevision.com>
 
+	* splay-tree.h (libi_uhostptr_t, libi_shostptr_t): Adjust types
+	work-a-round whitespace problem in gcc gengtype.
+
 	* splay-tree.h (libi_uhostptr_t, libi_shostptr_t): New types,
 	needed for WIN64 when a long is not wide enough for a pointer.
         (splay_tree_key, splay_tree_value): Use the new types.
diff --git a/include/splay-tree.h b/include/splay-tree.h
index 996d362ef..7df1a7c7b 100644
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -37,11 +37,11 @@ extern "C" {
 #include "ansidecl.h"
 
 #ifndef _WIN64
-  typedef unsigned long int  libi_uhostptr_t;
-  typedef long int           libi_shostptr_t;
+typedef unsigned long int libi_uhostptr_t;
+typedef long int libi_shostptr_t;
 #else
-  typedef unsigned long long libi_uhostptr_t;
-  typedef long long          libi_shostptr_t;
+typedef unsigned long long libi_uhostptr_t;
+typedef long long libi_shostptr_t;
 #endif
 
 #ifndef GTY