Changeset 5456 for trunk/include/win/wine/unicode.h

Timestamp:

Apr 3, 2001, 7:45:54 PM (24 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/wine/unicode.h (modified) (7 diffs)

trunk/include/win/wine/unicode.h

@@ -8 +8 @@
 #define __WINE_UNICODE_H
 
-#include "windef.h"
-#ifndef USE_INLINE_UNICODEFUNCS
-#include <heapstring.h>
+#ifndef OS2_INCLUDED
+#include <windef.h>
 #endif
 
@@ -70 +69 @@
 }
 
-#ifdef USE_INLINE_UNICODEFUNCS
 static inline WCHAR tolowerW( WCHAR ch )
 {
@@ -82 +80 @@
     return ch + casemap_upper[casemap_upper[ch >> 8] + (ch & 0xff)];
 }
-#endif
 
 /* the character type contains the C1_* flags in the low 12 bits */
@@ -94 +91 @@
 /* some useful string manipulation routines */
 
-#ifdef USE_INLINE_UNICODEFUNCS
 static inline unsigned int strlenW( const WCHAR *str )
 {
@@ -127 +123 @@
 #else
     WCHAR *p = dst;
-    while ((*p++ = *src++));
+    while(*src) {
+       *p++ = *src++;
+    }
 #endif
     return dst;
@@ -175 +173 @@
 {
     WCHAR *ret = str;
-    while ((*str = tolowerW(*str))) str++;
+    while(*str) {
+      *str = tolowerW(*str);
+      str++;
+    } 
     return ret;
 }
@@ -182 +183 @@
 {
     WCHAR *ret = str;
-    while ((*str = toupperW(*str))) str++;
+    while(*str) {
+      *str = toupperW(*str);
+      str++;
+    } 
     return ret;
 }
-#endif
 
 extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 );