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
This commit is contained in:
parent
baf8bb138b
commit
d20e3a5c7f
1 changed files with 3 additions and 8 deletions
|
@ -23,13 +23,14 @@
|
||||||
|
|
||||||
// includes
|
// includes
|
||||||
|
|
||||||
|
#include "tchar.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include <shellapi.h>
|
#include <shellapi.h>
|
||||||
#include <shlwapi.h>
|
#include <shlwapi.h>
|
||||||
#include <shlobj.h>
|
#include <shlobj.h>
|
||||||
#include "tchar.h"
|
|
||||||
#else
|
#else
|
||||||
# ifndef EXEHEAD
|
# ifndef EXEHEAD
|
||||||
# include <string.h>
|
# include <string.h>
|
||||||
|
@ -58,15 +59,9 @@ typedef unsigned char UCHAR;
|
||||||
typedef const char *LPCCH, *PCSTR, *LPCSTR;
|
typedef const char *LPCCH, *PCSTR, *LPCSTR;
|
||||||
typedef unsigned short WCHAR, OLECHAR, *PWCHAR, *LPWCH, *PWCH, *NWPSTR, *LPWSTR, *PWSTR, *BSTR;
|
typedef unsigned short WCHAR, OLECHAR, *PWCHAR, *LPWCH, *PWCH, *NWPSTR, *LPWSTR, *PWSTR, *BSTR;
|
||||||
typedef const unsigned short *LPCWCH, *PCWCH, *LPCWSTR, *PCWSTR, *LPCOLESTR;
|
typedef const unsigned short *LPCWCH, *PCWCH, *LPCWSTR, *PCWSTR, *LPCOLESTR;
|
||||||
#ifdef _UNICODE
|
#ifndef _tctime
|
||||||
typedef WCHAR TCHAR;
|
|
||||||
#define _T(x) L##x
|
|
||||||
#define TEXT(x) L##x
|
|
||||||
#define _tctime _wctime
|
#define _tctime _wctime
|
||||||
#else
|
#else
|
||||||
typedef CHAR TCHAR;
|
|
||||||
#define _T(x) x
|
|
||||||
#define TEXT(x) x
|
|
||||||
#define _tctime ctime
|
#define _tctime ctime
|
||||||
#endif
|
#endif
|
||||||
typedef int INT_PTR;
|
typedef int INT_PTR;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue