Merge trunk HEAD (r46369)

[reactos.git] / reactos / include / crt / tchar.h

diff --git a/reactos/include/crt/tchar.h b/reactos/include/crt/tchar.h
index 123f6d8..d7c3147 100644 (file)
--- a/reactos/include/crt/tchar.h
+++ b/reactos/include/crt/tchar.h
@@ -108,10 +108,11 @@ extern "C" {
   typedef wint_t _TINT;
 #endif
 
+#ifndef NO_OLDNAMES
 #ifndef _TCHAR_DEFINED
 #define _TCHAR_DEFINED
-#ifndef        NO_OLDNAMES
-  typedef wchar_t TCHAR;
+  typedef wchar_t TCHAR,*PTCHAR;
+  typedef wchar_t TBYTE,*PTBYTE;
 #endif
 #endif
 
@@ -771,11 +772,12 @@ extern "C" {
 #define __TCHAR_DEFINED
 #endif
 
+#ifndef NO_OLDNAMES
 #ifndef _TCHAR_DEFINED
-#ifndef        NO_OLDNAMES
-  typedef char TCHAR;
-#endif
 #define _TCHAR_DEFINED
+  typedef char TCHAR,*PTCHAR;
+  typedef unsigned char TBYTE,*PTBYTE;
+#endif
 #endif
 
 #ifdef _MB_MAP_DIRECT