tchar.h: fixed a third instance of TCHAR definition.
    added back the NO_OLDNAMES ifdefs, just in case.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1736 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/crt/tchar.h

diff --git a/mingw-w64-headers/crt/tchar.h b/mingw-w64-headers/crt/tchar.h
index 0dfd135..fa66537 100644
--- a/mingw-w64-headers/crt/tchar.h
+++ b/mingw-w64-headers/crt/tchar.h
@@ -106,11 +106,13 @@
   typedef wint_t _TINT;
 #endif
 
+#ifndef NO_OLDNAMES
 #ifndef _TCHAR_DEFINED
 #define _TCHAR_DEFINED
   typedef wchar_t TCHAR,*PTCHAR;
   typedef wchar_t TBYTE,*PTBYTE;
 #endif
+#endif
 
 #define _TEOF WEOF
 
@@ -754,11 +756,13 @@
 #define __TCHAR_DEFINED
 #endif
 
+#ifndef NO_OLDNAMES
 #ifndef _TCHAR_DEFINED
 #define _TCHAR_DEFINED
   typedef char TCHAR,*PTCHAR;
   typedef unsigned char TBYTE,*PTBYTE;
 #endif
+#endif
 
 #ifdef _MB_MAP_DIRECT
 
@@ -948,10 +952,11 @@
   typedef int _TINT;
 #endif
 
+#ifndef NO_OLDNAMES
 #ifndef _TCHAR_DEFINED
 #define _TCHAR_DEFINED
-#ifndef	NO_OLDNAMES
-  typedef char TCHAR;
+  typedef char TCHAR,*PTCHAR;
+  typedef unsigned char TBYTE,*PTBYTE;
 #endif
 #endif