include: Remove a misplaced duplicate definition of SORT_STRINGSORT.

Francois Gouget fgouget at codeweavers.com
Tue Sep 25 04:36:38 CDT 2012


---

When I noticed we declared NORM_STRINGSORT (which never existed) I 
replaced it with a definition of the correct SORT_STRINGSORT. But in 
fact we were already defining the latter in an unrelated part of the 
winnls.h file. That's why we did not have compilation issues (and not 
because {NORM,SORT}_STRINGSORT was unused as I thought).

 include/winnls.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/winnls.h b/include/winnls.h
index 71b5a8f..9ed4344 100644
--- a/include/winnls.h
+++ b/include/winnls.h
@@ -348,7 +348,7 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','
 #define SORT_DIGITSASNUMBERS       0x00000008
 #define LINGUISTIC_IGNORECASE      0x00000010
 #define LINGUISTIC_IGNOREDIACRITIC 0x00000020
-#define SORT_STRINGSORT            0x00001000
+#define SORT_STRINGSORT            0x00001000 /* Take punctuation into account */
 #define NORM_IGNOREKANATYPE        0x00010000
 #define NORM_IGNOREWIDTH           0x00020000
 #define NORM_LINGUISTIC_CASING     0x08000000
@@ -395,8 +395,6 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','
 #define LCMAP_SORTKEY    0x00000400	/* Create a sort key */
 #define LCMAP_BYTEREV    0x00000800	/* Reverse the result */
 
-#define SORT_STRINGSORT  0x00001000	/* Take punctuation into account */
-
 #define LCMAP_HIRAGANA   0x00100000	/* Transform Japanese katakana into hiragana */
 #define LCMAP_KATAKANA   0x00200000	/* Transform Japanese hiragana into katakana */
 #define LCMAP_HALFWIDTH  0x00400000	/* Use single byte chars in output */
-- 
1.7.10.4



More information about the wine-patches mailing list