From d20e3a5c7f365a6ed0b4079b499f390237b0fcb7 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 24 Mar 2013 06:06:54 +0000 Subject: [PATCH] we need properly defined TCHAR on POSIX too git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6312 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/Platform.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Source/Platform.h b/Source/Platform.h index 1bde9885..c34c154e 100644 --- a/Source/Platform.h +++ b/Source/Platform.h @@ -23,13 +23,14 @@ // includes +#include "tchar.h" + #ifdef _WIN32 #include #include #include #include #include -#include "tchar.h" #else # ifndef EXEHEAD # include @@ -58,15 +59,9 @@ typedef unsigned char UCHAR; typedef const char *LPCCH, *PCSTR, *LPCSTR; typedef unsigned short WCHAR, OLECHAR, *PWCHAR, *LPWCH, *PWCH, *NWPSTR, *LPWSTR, *PWSTR, *BSTR; typedef const unsigned short *LPCWCH, *PCWCH, *LPCWSTR, *PCWSTR, *LPCOLESTR; -#ifdef _UNICODE -typedef WCHAR TCHAR; -#define _T(x) L##x -#define TEXT(x) L##x +#ifndef _tctime #define _tctime _wctime #else -typedef CHAR TCHAR; -#define _T(x) x -#define TEXT(x) x #define _tctime ctime #endif typedef int INT_PTR;