pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

cximage договорились собирать без юникода

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59341 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Oleg.Korshul
2014-10-30 11:36:49 +00:00
committed by Alexander Trofimov
parent 04430a32d3
commit 2eef50257d
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/cximage/CxImage/ximaiter.h
View File

@ -31,6 +31,8 @@
#include "ximage.h"
#include "ximadef.h"
#include <algorithm>
/*
#ifndef min
#define min(a,b) (((a)<(b))?(a):(b))

12
DesktopEditor/cximage/CxImage/xiofile.h
View File

@ -2,18 +2,6 @@
#define __xiofile_h
#include "xfile.h"
#ifndef _WIN32
#include "../../../Common/DocxFormat/Source/Base/ASCString.h"
#endif
//#include <TCHAR.h>
#ifndef WIN32
#ifdef _UNICODE
typedef wchar_t TCHAR;
#else
typedef char TCHAR;
#endif
#endif
class DLL_EXP CxIOFile : public CxFile
{