# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1332952175 0 # Node ID 48fabb2f93c5b3adfa2803eded25d1109f772270 # Parent d97e3f7f4e475db870609bef574716dbad200381 On Windows with the correct -DUNICODE -D_UNICODE and #include lines the hacky #ifdefs I had in the source file are no longer needed. Removed. diff -r d97e3f7f4e47 -r 48fabb2f93c5 win/dw.c --- a/win/dw.c Wed Mar 28 16:14:49 2012 +0000 +++ b/win/dw.c Wed Mar 28 16:29:35 2012 +0000 @@ -455,43 +455,9 @@ WideCharToMultiByte(CP_UTF8, 0, widestring, -1, retbuf, WideCharToMultiByte(CP_UTF8, 0, widestring, -1, NULL, 0, NULL, NULL), NULL, NULL); return retbuf; } -/* FIXME: Not sure why this is needed */ -#ifndef _tstol -#define _tstol _wtol -#endif -#ifndef _tcscpy -#define _tcscpy wcscpy -#endif -#ifndef _sntprintf -#define _sntprintf _snwprintf -#endif -#ifndef _stprintf -#define _stprintf _swprintf -#endif -#ifndef _tcsftime -#define _tcsftime wcsftime -#endif - #else #define UTF8toWide(a) a #define WideToUTF8(a) a -/* FIXME: Not sure why this is needed */ -#ifndef _tstol -#define _tstol atol -#endif -#ifndef _tcscpy -#define _tcscpy strcpy -#endif -#ifndef _sntprintf -#define _sntprintf _snprintf -#endif -#ifndef _stprintf -#define _stprintf sprintf -#endif -#ifndef _tcsftime -#define _tcsftime strftime -#endif - #endif DWORD GetDllVersion(LPCTSTR lpszDllName)