* include/tchar.h: (__TEXT): Remove undef.

	(_TEXT): Ditto.
	(_T): Ditto.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index c991563..2e740b5 100644 (file)
--- 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 5ec224e..2c0d037 100644 (file)
--- 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_ */