* regtool.cc (KEY_WOW64_64KEY): Drop definition. Instead define

	WINVER to 0x0502 before including windows.h.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index bf88001..3afb869 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,5 +1,10 @@
 2006-10-16  Corinna Vinschen  <corinna@vinschen.de>
 
+       * regtool.cc (KEY_WOW64_64KEY): Drop definition.  Instead define 
+       WINVER to 0x0502 before including windows.h.
+
+2006-10-16  Corinna Vinschen  <corinna@vinschen.de>
+
        * regtool.cc (KEY_WOW64_64KEY): Define.
        (longopts): Add --wow64 option.
        (opts): Add -w option.

diff --git a/winsup/utils/regtool.cc b/winsup/utils/regtool.cc
index d128cbc..b9ed8a8 100644 (file)
--- a/winsup/utils/regtool.cc
+++ b/winsup/utils/regtool.cc
@@ -13,15 +13,12 @@ details. */
 #include <errno.h>
 #include <ctype.h>
 #include <getopt.h>
+#define WINVER 0x0502
 #include <windows.h>
 #include <sys/cygwin.h>
 
 #define DEFAULT_KEY_SEPARATOR '\\'
 
-#ifndef KEY_WOW64_64KEY
-#define KEY_WOW64_64KEY 0x100
-#endif
-
 enum
 {
   KT_AUTO, KT_BINARY, KT_INT, KT_STRING, KT_EXPAND, KT_MULTI