Add <wchar.h> to tkWinPort.h, and

remove some earlier CYGWIN-related
hacks which then are no longer necessary.

1 files changed, 7 insertions, 11 deletions

diff --git a/win/tkWinSend.c b/win/tkWinSend.c
index 1eaf6d1..18a7d72 100644
--- a/win/tkWinSend.c
+++ b/win/tkWinSend.c
@@ -10,16 +10,12 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinSend.c,v 1.23 2010/02/03 23:56:49 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinSend.c,v 1.24 2010/04/08 14:06:20 nijtmans Exp $
  */
-
+#include <tchar.h>
 #include "tkInt.h"
 #include "tkWinSendCom.h"
 
-#ifdef _MSC_VER
-#define vsnprintf _vsnprintf
-#endif
-
 /*
  * Should be defined in WTypes.h but mingw 1.0 is missing them.
  */
@@ -847,11 +843,11 @@ Win32ErrorObj(
 
     if (lpBuffer == NULL) {
 	lpBuffer = sBuffer;
-	wsprintf(sBuffer, (const char *)_T("Error Code: %08lX"), hrError);
+	wsprintf(sBuffer, TEXT("Error Code: %08lX"), hrError);
     }
 
-    if ((p = _tcsrchr(lpBuffer, _T('\r'))) != NULL) {
-	*p = _T('\0');
+    if ((p = _tcsrchr(lpBuffer, TEXT('\r'))) != NULL) {
+	*p = TEXT('\0');
     }
 
 #ifdef _UNICODE
@@ -1038,8 +1034,8 @@ SendTrace(
     static char buffer[1024];
 
     va_start(args, format);
-    vsnprintf(buffer, 1023, format, args);
-    OutputDebugString(buffer);
+    _vsnprintf(buffer, 1023, format, args);
+    OutputDebugStringA(buffer);
     va_end(args);
 }