Correct misuse of #ifdef, identified by 'make test'.

diff --git a/w32api/ChangeLog b/w32api/ChangeLog
index 72b1fa0..e59ec2a 100644 (file)
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-03  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Correct misuse of #ifdef, identified by 'make test'.
+
+       * include/shlwapi.h (enum ASSOCSTR, enum ASSOCDATA): Fix typos;
+       /#ifdef _WIN32_IE >= 0x0600/s/#ifdef/#if/
+
 2011-12-22  Corinna Vinschen  <corinna@vinschen.de>
 
        Replace more incorrectly named manifest constants.

diff --git a/w32api/include/shlwapi.h b/w32api/include/shlwapi.h
index 1d74b93..0708fc9 100644 (file)
--- a/w32api/include/shlwapi.h
+++ b/w32api/include/shlwapi.h
@@ -69,7 +69,7 @@ typedef enum {
     ASSOCSTR_DDEAPPLICATION,
     ASSOCSTR_DDETOPIC,
     ASSOCSTR_INFOTIP
-#ifdef _WIN32_IE >= 0x0600
+#if _WIN32_IE >= 0x0600
     ,
     ASSOCSTR_QUICKTIP,
     ASSOCSTR_TILEINFO,
@@ -91,7 +91,7 @@ typedef enum
     ASSOCDATA_NOACTIVATEHANDLER,
     ASSOCDATA_QUERYCLASSSTORE,
     ASSOCDATA_HASPERUSERASSOC
-#ifdef _WIN32_IE >= 0x0600
+#if _WIN32_IE >= 0x0600
     ,
     ASSOCDATA_EDITFLAGS,
     ASSOCDATA_VALUE