From ff98730906402d0b52c487a216289c142581dbb7 Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Wed, 9 Aug 2017 23:33:57 -0400
Subject: [PATCH] don't define UNICODE for msvc2005

---
 gfx/drivers_context/wgl_ctx.c     | 3 +++
 gfx/drivers_font/d3d_w32_font.cpp | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index 5c0d7b4e49..5e19fbfa67 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -23,7 +23,10 @@
 #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
 #endif
 
+#if !defined(_MSC_VER) || _MSC_VER > 1400
 #define UNICODE
+#endif
+
 #include <tchar.h>
 #include <wchar.h>
 
diff --git a/gfx/drivers_font/d3d_w32_font.cpp b/gfx/drivers_font/d3d_w32_font.cpp
index 8a7b903765..6347bb5bf2 100644
--- a/gfx/drivers_font/d3d_w32_font.cpp
+++ b/gfx/drivers_font/d3d_w32_font.cpp
@@ -27,6 +27,8 @@
 #include "../include/d3d9/d3dx9core.h"
 #endif
 
+#include <tchar.h>
+
 typedef struct
 {
    d3d_video_t *d3d;
@@ -47,11 +49,7 @@ static void *d3dfonts_w32_init_font(void *video_data,
       OUT_TT_PRECIS,
       CLIP_DEFAULT_PRECIS,
       DEFAULT_PITCH,
-#if defined(_MSC_VER) && defined(UNICODE) /* MSVC needs w_char* if using Unicode */
-      L"Verdana" /* Hardcode FTL */
-#else
-      "Verdana"
-#endif
+      _T("Verdana") /* Hardcode FTL */
    };
 
    d3dfonts = (d3dfonts_t*)calloc(1, sizeof(*d3dfonts));