Moved the definition of PTSTR and LPTSTR from tchar.h to winnt.h.

include/tchar.h

@@ -256,14 +256,6 @@ DECL_WINELIB_TYPE_AW (_TCHAR)
 typedef UCHAR  _TUCHARA;
 typedef WCHAR _TUCHARW;
 DECL_WINELIB_TYPE_AW (_TUCHAR)
-typedef CHAR TCHARA, *PTCHARA;
-typedef WCHAR TCHARW, *PTCHARW;
-DECL_WINELIB_TYPE_AW (TCHAR)
-DECL_WINELIB_TYPE_AW (PTCHAR)
-typedef LPWSTR PTSTRW, LPTSTRW;
-typedef LPSTR PTSTRA, LPTSTRA;
-DECL_WINELIB_TYPE_AW (PTSTR)
-DECL_WINELIB_TYPE_AW (LPTSTR)
 	 
 #ifdef __cplusplus
 } /* extern "C" */

include/winnt.h

@@ -79,12 +79,14 @@
 
 #ifndef __WINE__
 # ifdef UNICODE
-typedef LPWSTR LPTSTR;
-typedef LPCWSTR LPCTSTR;
+typedef WCHAR TCHAR, *PTCHAR;
+typedef LPWSTR PTSTR, LPTSTR;
+typedef LPCWSTR PCTSTR, LPCTSTR;
 #define __TEXT(string) L##string /*probably wrong */
 # else  /* UNICODE */
-typedef LPSTR LPTSTR;
-typedef LPCSTR LPCTSTR;
+typedef char TCHAR, *PTCHAR;
+typedef LPSTR PTSTR, LPTSTR;
+typedef LPCSTR PCTSTR, LPCTSTR;
 #define __TEXT(string) string
 # endif /* UNICODE */
 #endif   /* __WINE__ */