From ecceeaa810eddddcd0f0d8c16b9d08d15c50cfc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 29 Sep 2020 10:25:26 +0200 Subject: [PATCH] We no longer use TCHAR. --- ext/native/base/basictypes.h | 12 ------------ headless/WindowsHeadlessHost.cpp | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ext/native/base/basictypes.h b/ext/native/base/basictypes.h index b104506eaa..feb9abfb13 100644 --- a/ext/native/base/basictypes.h +++ b/ext/native/base/basictypes.h @@ -28,12 +28,6 @@ } #endif -#ifdef _WIN32 - -#include - -#endif // _WIN32 - // Byteswapping #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) @@ -71,9 +65,3 @@ inline uint64_t swap64(const uint8_t* _pData) {return swap64(*(const uint64_t*)_ #else #define __THREAD __thread #endif - -// For really basic windows code compat -#ifndef _TCHAR_DEFINED -typedef char TCHAR; -#endif - diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp index 5d5e79dfc7..c5b9ef9594 100644 --- a/headless/WindowsHeadlessHost.cpp +++ b/headless/WindowsHeadlessHost.cpp @@ -56,13 +56,13 @@ HWND CreateHiddenWindow() { LoadCursor(NULL, IDC_ARROW), (HBRUSH) GetStockObject(BLACK_BRUSH), NULL, - _T("PPSSPPHeadless"), + L"PPSSPPHeadless", NULL, }; RegisterClassEx(&wndClass); DWORD style = WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_POPUP; - return CreateWindowEx(0, _T("PPSSPPHeadless"), _T("PPSSPPHeadless"), style, CW_USEDEFAULT, CW_USEDEFAULT, WINDOW_WIDTH, WINDOW_HEIGHT, NULL, NULL, NULL, NULL); + return CreateWindowEx(0, L"PPSSPPHeadless", L"PPSSPPHeadless", style, CW_USEDEFAULT, CW_USEDEFAULT, WINDOW_WIDTH, WINDOW_HEIGHT, NULL, NULL, NULL, NULL); } void WindowsHeadlessHost::LoadNativeAssets()