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

Work in progress to fix the Windows build.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2018-07-07 23:53:16 -03:00
parent 760288f17b
commit de2ff27255
8 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/win32/msvc14/engine.vcxproj
View File

@ -142,6 +142,7 @@
<ClCompile Include="..\..\..\src\jrd\sqz.cpp" />
<ClCompile Include="..\..\..\src\jrd\svc.cpp" />
<ClCompile Include="..\..\..\src\jrd\SysFunction.cpp" />
<ClCompile Include="..\..\..\src\jrd\SystemPackages.cpp" />
<ClCompile Include="..\..\..\src\jrd\TempSpace.cpp" />
<ClCompile Include="..\..\..\src\jrd\TimeZone.cpp" />
<ClCompile Include="..\..\..\src\jrd\tpc.cpp" />
@ -316,6 +317,7 @@
<ClInclude Include="..\..\..\src\jrd\svc.h" />
<ClInclude Include="..\..\..\src\jrd\svc_undoc.h" />
<ClInclude Include="..\..\..\src\jrd\SysFunction.h" />
<ClInclude Include="..\..\..\src\jrd\SystemPackages.h" />
<ClInclude Include="..\..\..\src\jrd\TempSpace.h" />
<ClInclude Include="..\..\..\src\jrd\TimeZone.h" />
<ClInclude Include="..\..\..\src\jrd\tpc_proto.h" />
@ -561,4 +563,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

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

@ -465,6 +465,9 @@
<ClCompile Include="..\..\..\src\dsql\DsqlBatch.cpp">
<Filter>DSQL</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\jrd\SystemPackages.cpp">
<Filter>JRD files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h">
@ -995,6 +998,9 @@
<ClInclude Include="..\..\..\src\dsql\DsqlBatch.h">
<Filter>Header files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\jrd\SystemPackages.h">
<Filter>Header files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\dsql\DdlNodes.epp">
@ -1046,4 +1052,4 @@
<Filter>Resource files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>

3
src/common/TimeZoneUtil.cpp
View File

@ -27,9 +27,6 @@
//// TODO: Configure ICU time zone data files.
//// TODO: Update Windows ICU.
// Uncomment to generate list of time zones to be updated in TimeZones.h
//#define TZ_UPDATE
#include "firebird.h"
#include "../common/TimeZoneUtil.h"
#include "../common/StatusHolder.h"

2
src/common/unicode_util.cpp
View File

@ -295,7 +295,7 @@ private:
getEntryPoint("ucal_getNow", inModule, ucalGetNow);
getEntryPoint("ucal_getTimeZoneTransitionDate", inModule, ucalGetTimeZoneTransitionDate);
#ifdef DEV_BUILD
#if defined DEV_BUILD && defined TZ_UPDATE
getEntryPoint("ucal_openTimeZones", inModule, ucalOpenTimeZones);
getEntryPoint("uenum_close", inModule, uenumClose);

2
src/common/unicode_util.h
View File

@ -138,7 +138,7 @@ public:
UBool (U_EXPORT2* ucalGetTimeZoneTransitionDate) (const UCalendar* cal, UTimeZoneTransitionType type,
UDate* transition, UErrorCode* status);
#ifdef DEV_BUILD
#if defined DEV_BUILD && defined TZ_UPDATE
UEnumeration* (U_EXPORT2* ucalOpenTimeZones) (UErrorCode* ec);
void (U_EXPORT2* uenumClose) (UEnumeration* en);

3
src/include/firebird.h
View File

@ -32,6 +32,9 @@
#ifndef INCLUDE_Firebird_H
#define INCLUDE_Firebird_H
// Uncomment to generate list of time zones to be updated in src/common/TimeZones.h
//#define TZ_UPDATE
#ifdef _MSC_VER
#include "gen/autoconfig_msvc.h"
#else

4
src/yvalve/YObjects.h
View File

@ -660,8 +660,8 @@ public:
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
unsigned timeZoneBufferLength, char* timeZoneBuffer);
void decodeTimeStampTz(Firebird::CheckStatusWrapper* status, const ISC_TIMESTAMP_TZ* timeStampTz,
uint* year, uint* month, uint* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
unsigned timeZoneBufferLength, char* timeZoneBuffer);
unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds,
unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer);
void encodeTimeTz(Firebird::CheckStatusWrapper* status, ISC_TIME_TZ* timeTz,
unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone);
void encodeTimeStampTz(Firebird::CheckStatusWrapper* status, ISC_TIMESTAMP_TZ* timeStampTz,

8
src/yvalve/utl.cpp
View File

@ -713,8 +713,8 @@ void UtilInterface::encodeTimeTz(CheckStatusWrapper* status, ISC_TIME_TZ* timeTz
}
void UtilInterface::decodeTimeStampTz(CheckStatusWrapper* status, const ISC_TIMESTAMP_TZ* timeStampTz,
uint* year, uint* month, uint* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
unsigned timeZoneBufferLength, char* timeZoneBuffer)
unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds,
unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer)
{
try
{
@ -753,8 +753,8 @@ void UtilInterface::decodeTimeStampTz(CheckStatusWrapper* status, const ISC_TIME
}
void UtilInterface::encodeTimeStampTz(CheckStatusWrapper* status, ISC_TIMESTAMP_TZ* timeStampTz,
uint year, uint month, uint day, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions,
const char* timeZone)
unsigned year, unsigned month, unsigned day, unsigned hours, unsigned minutes, unsigned seconds,
unsigned fractions, const char* timeZone)
{
try
{