remove explicit unicode def/undefs

gfx/common/win32_common.h

@@ -18,12 +18,10 @@
 #define WIN32_COMMON_H__
 
 #include <string.h>
+#include <encodings/win32.h>
 
 #ifndef _XBOX
 #define WIN32_LEAN_AND_MEAN
-#define UNICODE
-#include <tchar.h>
-#include <wchar.h>
 #include <windows.h>
 #endif
 

gfx/drivers/d3d.cpp

@@ -15,13 +15,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <encodings/win32.h>
+
 #ifdef _XBOX
 #include <xtl.h>
 #include <xgraphics.h>
-#else
-#define UNICODE
-#include <tchar.h>
-#include <wchar.h>
 #endif
 
 #include <formats/image.h>

input/drivers/dinput.c

@@ -29,10 +29,7 @@
 #define WM_MOUSEWHEEL 0x020A
 #endif
 
-#define UNICODE
+#include <encodings/win32.h>
-#include <tchar.h>
-#include <wchar.h>
-
 #include <dinput.h>
 
 #include <stdlib.h>

libretro-common/include/compat/msvc.h

@@ -53,7 +53,6 @@ extern "C"  {
 }
 #endif
 
-#undef UNICODE /* Do not bother with UNICODE at this time. */
 #include <direct.h>
 #include <stddef.h>
 #include <math.h>

libretro-common/include/encodings/win32.h

@@ -28,7 +28,17 @@
 #define UNICODE
 #include <tchar.h>
 #include <wchar.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <encodings/utf.h>
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 #endif
 

libretro-common/include/retro_miscellaneous.h

@@ -45,11 +45,12 @@
 #include <time.h>
 #endif
 
+#ifdef _WIN32
+#include <encodings/win32.h>
+#endif
+
 #if defined(_WIN32) && !defined(_XBOX)
 #define WIN32_LEAN_AND_MEAN
-#define UNICODE
-#include <tchar.h>
-#include <wchar.h>
 #include <windows.h>
 #elif defined(_WIN32) && defined(_XBOX)
 #include <Xtl.h>

libretro-common/streams/file_stream.c

@@ -26,9 +26,7 @@
 #include <errno.h>
 
 #if defined(_WIN32)
-#  define UNICODE
+#include <encodings/win32.h>
-#  include <tchar.h>
-#  include <wchar.h>
 #  ifdef _MSC_VER
 #    define setmode _setmode
 #  endif