Changeset 21725 for branches/gcc-kmk/src

Timestamp:

Oct 19, 2011, 10:48:09 PM (14 years ago)

Author:

dmik

Message:

GCC doesn't have wcstr.h (wchar.h replaces it when needed).

Location:

branches/gcc-kmk/src

Files:

• kernel32/heapstring.cpp (modified) (1 diff)
• kernel32/ole2nls.c (modified) (2 diffs)
• shell32/misc.cpp (modified) (1 diff)
• shlwapi/ordinal_odin.cpp (modified) (1 diff)
• shlwapi/string_odin.cpp (modified) (1 diff)
• shlwapi/url_odin.cpp (modified) (1 diff)

branches/gcc-kmk/src/kernel32/heapstring.cpp

@@ -25 +25 @@
 #include <unicode.h>
 #include <ctype.h>
+#include <wchar.h>
+#ifndef __GNUC__
 #include <wcstr.h>
+#endif
 #include "heap.h"
 #include <wine/unicode.h>

branches/gcc-kmk/src/kernel32/ole2nls.c

@@ -16 +16 @@
 #include <heapstring.h>
 #include <ctype.h>
+#ifndef __GNUC__
 #include <wcstr.h>
+#endif
 #endif
 
@@ -1926 +1928 @@
 #ifdef __WIN32OS2__
     /* For WCHAR we better use the WCHAR toupper/lower.
-     * (VAC308 toupper/tolower doesn't do range checks according to standards 
+     * (VAC308 toupper/tolower doesn't do range checks according to standards
      *  which may cause illegal memory reads access when misused like it were here.
      */

branches/gcc-kmk/src/shell32/misc.cpp

@@ -20 +20 @@
 
 #include <wchar.h>
+#ifndef __GNUC__
 #include <wcstr.h>
+#endif
 
 #define CINTERFACE

branches/gcc-kmk/src/shlwapi/ordinal_odin.cpp

@@ -29 +29 @@
 #include <ctype.h>
 #include <wctype.h>
+#ifndef __GNUC__
 #include <wcstr.h>
+#endif
 #define HAVE_WCTYPE_H
 

branches/gcc-kmk/src/shlwapi/string_odin.cpp

@@ -33 +33 @@
 #include <ctype.h>
 #include <wctype.h>
+#ifndef __GNUC__
 #include <wcstr.h>
+#endif
 #define HAVE_WCTYPE_H
 

branches/gcc-kmk/src/shlwapi/url_odin.cpp

@@ -28 +28 @@
 #include <ctype.h>
 #include <wctype.h>
+#ifndef __GNUC__
 #include <wcstr.h>
+#endif
 #define HAVE_WCTYPE_H