firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 09:20:39 +01:00
Code Issues

Fixed Windows build.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2018-04-05 19:14:21 -03:00
parent 3b5aa40b43
commit b11daa52cc
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/win32/msvc14/common.vcxproj
View File

@ -91,6 +91,7 @@
<ClCompile Include="..\..\..\src\common\TextType.cpp" />
<ClCompile Include="..\..\..\src\common\ThreadData.cpp" />
<ClCompile Include="..\..\..\src\common\ThreadStart.cpp" />
<ClCompile Include="..\..\..\src\common\TimeZoneUtil.cpp" />
<ClCompile Include="..\..\..\src\common\Tokens.cpp" />
<ClCompile Include="..\..\..\src\common\unicode_util.cpp" />
<ClCompile Include="..\..\..\src\common\utils.cpp" />
@ -201,6 +202,7 @@
<ClInclude Include="..\..\..\src\common\TextType.h" />
<ClInclude Include="..\..\..\src\common\ThreadData.h" />
<ClInclude Include="..\..\..\src\common\ThreadStart.h" />
<ClInclude Include="..\..\..\src\common\TimeZoneUtil.h" />
<ClInclude Include="..\..\..\src\common\Tokens.h" />
<ClInclude Include="..\..\..\src\common\unicode_util.h" />
<ClInclude Include="..\..\..\src\common\UtilSvc.h" />

8
builds/win32/msvc14/common.vcxproj.filters
View File

@ -228,6 +228,9 @@
<ClCompile Include="..\..\..\src\common\sha2\sha2.cpp">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\TimeZoneUtil.cpp">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\common\classes\zip.cpp">
<Filter>classes</Filter>
</ClCompile>
@ -557,8 +560,11 @@
<ClInclude Include="..\..\..\src\common\sha2\sha2.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\TimeZoneUtil.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\classes\zip.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>

12
src/common/TimeZoneUtil.h
View File

@ -30,6 +30,18 @@
#include "../common/classes/fb_string.h"
#include "../common/cvt.h"
// struct tm declaration
#if defined(TIME_WITH_SYS_TIME)
#include <sys/time.h>
#include <time.h>
#else
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#else
#include <time.h>
#endif
#endif
namespace Firebird {
class TimeZoneUtil

4
src/common/unicode_util.cpp
View File

@ -257,6 +257,8 @@ private:
getEntryPoint("ucnv_setFromUCallBack", module, ucnv_setFromUCallBack);
getEntryPoint("ucnv_setToUCallBack", module, ucnv_setToUCallBack);
getEntryPoint("u_strcmp", module, ustrcmp);
#ifdef WIN_NT
if (uSetDataDirectory)
{
@ -282,8 +284,6 @@ private:
if (!inModule)
return;
getEntryPoint("u_strcmp", inModule, ustrcmp);
getEntryPoint("ucal_open", inModule, ucalOpen);
getEntryPoint("ucal_close", inModule, ucalClose);
getEntryPoint("ucal_setMillis", inModule, ucalSetMillis);