From ba40e4c208f7a4c8a525c048d2eae05e17364a3c Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 19 Mar 2000 12:45:28 +0000 Subject: [PATCH] Moved the definition of PTSTR and LPTSTR from tchar.h to winnt.h. --- include/tchar.h | 8 -------- include/winnt.h | 10 ++++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index c9b7ff5ec6c..2451f722784 100644 --- a/include/tchar.h +++ b/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" */ diff --git a/include/winnt.h b/include/winnt.h index 0812239e2a5..50cd63d995c 100644 --- a/include/winnt.h +++ b/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__ */ -- 2.11.4.GIT