From d53c723240149c5b847addbf279aafc0f1af6c16 Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Wed, 21 Feb 2001 19:33:42 +0000
Subject: [PATCH] 	* include/tchar.h: (__TEXT): Remove undef. 
 (_TEXT): Ditto. 	(_T): Ditto.

---
 winsup/mingw/ChangeLog       | 6 ++++++
 winsup/mingw/include/tchar.h | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index c99156319..2e740b5fd 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,4 +1,10 @@
 
+2000-02-21  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	* include/tchar.h: (__TEXT): Remove undef.
+	(_TEXT): Ditto.
+	(_T): Ditto.
+
 Fri Feb  2 10:34:07  2001  Earnie Boyd  <earnie@users.sourceforge.net>
 
 	* include/tchar.h: (__TEXT): Add private macro.
diff --git a/winsup/mingw/include/tchar.h b/winsup/mingw/include/tchar.h
index 5ec224ebb..2c0d03777 100644
--- a/winsup/mingw/include/tchar.h
+++ b/winsup/mingw/include/tchar.h
@@ -66,8 +66,7 @@ typedef	wchar_t	TCHAR;
  * macro within your programs.  It's name and function could change without
  * notice.
  */
-#undef  __TEXT
-#define	__TEXT(x)	L ## x
+#define	__TEXT(x)	L##x
 
 /*  for porting from other Windows compilers */
 #if 0  // no  wide startup module
@@ -217,7 +216,6 @@ typedef char	TCHAR;
  * macro within your programs.  It's name and function could change without
  * notice.
  */
-#undef __TEXT
 #define	__TEXT(x)	x
 
 /*  for porting from other Windows compilers */
@@ -354,9 +352,7 @@ typedef char	TCHAR;
  * UNICODE a constant string when _UNICODE is defined else returns the string
  * unmodified.  Also defined in w32api/winnt.h.
  */
-#undef  _TEXT
 #define _TEXT(x)	__TEXT(x)
-#undef  _T
 #define	_T(x)		__TEXT(x)
 
 #endif	/* Not _TCHAR_H_ */