Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Marshall <keithmarshall@@users.sf.net>2012-01-03 23:09:39 +0400
committerKeith Marshall <keithmarshall@@users.sf.net>2012-01-03 23:09:39 +0400
commit2a4b36abb71373c39fb84add0c6405049f5b8e76 (patch)
tree49fddd0b4d6763f1cfd3b7f45501f102f64b1828 /winsup/w32api
parentb9f131c820ef35c46d4a32e01d3ec8250a952457 (diff)
Correct misuse of #ifdef, identified by 'make test'.
Diffstat (limited to 'winsup/w32api')
-rw-r--r--winsup/w32api/ChangeLog7
-rw-r--r--winsup/w32api/include/shlwapi.h4
2 files changed, 9 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 96482eaa0..675fd6a29 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-03 Keith Marshall <keithmarshall@users.sf.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>
* include/winnt.h (JOB_OBJECT_LIMIT_BREAKAWAY_OK): Define.
diff --git a/winsup/w32api/include/shlwapi.h b/winsup/w32api/include/shlwapi.h
index 4e844b155..2905eb5be 100644
--- a/winsup/w32api/include/shlwapi.h
+++ b/winsup/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