Moved the definition of PTSTR and LPTSTR from tchar.h to winnt.h.
This commit is contained in:
parent
a4af44ad52
commit
ba40e4c208
|
@ -256,14 +256,6 @@ DECL_WINELIB_TYPE_AW (_TCHAR)
|
||||||
typedef UCHAR _TUCHARA;
|
typedef UCHAR _TUCHARA;
|
||||||
typedef WCHAR _TUCHARW;
|
typedef WCHAR _TUCHARW;
|
||||||
DECL_WINELIB_TYPE_AW (_TUCHAR)
|
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
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
|
|
|
@ -79,12 +79,14 @@
|
||||||
|
|
||||||
#ifndef __WINE__
|
#ifndef __WINE__
|
||||||
# ifdef UNICODE
|
# ifdef UNICODE
|
||||||
typedef LPWSTR LPTSTR;
|
typedef WCHAR TCHAR, *PTCHAR;
|
||||||
typedef LPCWSTR LPCTSTR;
|
typedef LPWSTR PTSTR, LPTSTR;
|
||||||
|
typedef LPCWSTR PCTSTR, LPCTSTR;
|
||||||
#define __TEXT(string) L##string /*probably wrong */
|
#define __TEXT(string) L##string /*probably wrong */
|
||||||
# else /* UNICODE */
|
# else /* UNICODE */
|
||||||
typedef LPSTR LPTSTR;
|
typedef char TCHAR, *PTCHAR;
|
||||||
typedef LPCSTR LPCTSTR;
|
typedef LPSTR PTSTR, LPTSTR;
|
||||||
|
typedef LPCSTR PCTSTR, LPCTSTR;
|
||||||
#define __TEXT(string) string
|
#define __TEXT(string) string
|
||||||
# endif /* UNICODE */
|
# endif /* UNICODE */
|
||||||
#endif /* __WINE__ */
|
#endif /* __WINE__ */
|
||||||
|
|
Loading…
Reference in New Issue