diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/winreg.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 9b06eac68..2632de5cb 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2008-02-24 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> + + * include/winnt.h: Update guard around KEY_WOW64_64KEY and KEY_WOW64_32KEY + definitions. + * include/winreg.h (KEY_WOW64_64KEY, KEY_WOW64_32KEY): Remove. + 2008-02-23 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> * include/winnt.h (KEY_WOW64_64KEY, KEY_WOW64_32KEY): Define. diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 21ef9d6e9..60d8ca59c 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -975,7 +975,7 @@ typedef DWORD FLONG; #define KEY_WRITE 0x20006 #define KEY_EXECUTE 0x20019 #define KEY_READ 0x20019 -#if (_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0502) #define KEY_WOW64_64KEY 0x0100 #define KEY_WOW64_32KEY 0x0200 #endif diff --git a/winsup/w32api/include/winreg.h b/winsup/w32api/include/winreg.h index 0e5fbf118..81aebba2f 100644 --- a/winsup/w32api/include/winreg.h +++ b/winsup/w32api/include/winreg.h @@ -41,11 +41,6 @@ extern "C" { #define REG_NOTIFY_CHANGE_LAST_SET 4 #define REG_NOTIFY_CHANGE_SECURITY 8 -#if (WINVER >= 0x0502) -#define KEY_WOW64_32KEY 0x0200 -#define KEY_WOW64_64KEY 0x0100 -#endif - #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; typedef struct value_entA { |