Changeset 21478 for trunk/include

Timestamp:

Nov 27, 2010, 11:12:39 AM (15 years ago)

Author:

dmik

Message:

Do not define TCHAR twice.

Location:

trunk/include/win

Files:

• windef.h (modified) (1 diff)
• winnt.h (modified) (2 diffs)

trunk/include/win/windef.h

@@ -560 +560 @@
 /* depend on the UNICODE macro that only exists in user's code. */
 
-#ifndef __WINE__
+#if !defined(__WINE__) && !defined(_TCHAR_DEFINED)
+#define _TCHAR_DEFINED
 # ifdef UNICODE
 typedef WCHAR TCHAR;

trunk/include/win/winnt.h

@@ -116 +116 @@
 typedef const WCHAR    *PCWCH,      *LPCWCH;
 
+#if !defined(_TCHAR_DEFINED)
+# define _TCHAR_DEFINED
 # ifdef UNICODE
 typedef WCHAR           TCHAR,      *PTCHAR;
@@ -129 +131 @@
 #  define __TEXT(string) string
 # endif /* UNICODE */
-# define TEXT(quote) __TEXT(quote)
+#endif
+#define TEXT(quote) __TEXT(quote)
 
 /* Types */