Skip to content

Commit 28058cf

Browse files
committed
Revert "Move gds.cpp to common."
This reverts commit f296f44.
1 parent f93852a commit 28058cf

File tree

8 files changed

+22
-8
lines changed

8 files changed

+22
-8
lines changed

builds/win32/msvc15/common.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
<ClCompile Include="..\..\..\src\common\DynamicStrings.cpp" />
7070
<ClCompile Include="..\..\..\src\common\enc.cpp" />
7171
<ClCompile Include="..\..\..\src\common\fb_exception.cpp" />
72-
<ClCompile Include="..\..\..\src\common\gds.cpp" />
7372
<ClCompile Include="..\..\..\src\common\Int128.cpp" />
7473
<ClCompile Include="..\..\..\src\common\IntlParametersBlock.cpp" />
7574
<ClCompile Include="..\..\..\src\common\IntlUtil.cpp" />

builds/win32/msvc15/common.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,6 @@
246246
<ClCompile Include="..\..\..\src\common\keywords.cpp">
247247
<Filter>common</Filter>
248248
</ClCompile>
249-
<ClCompile Include="..\..\..\src\common\gds.cpp">
250-
<Filter>common</Filter>
251-
</ClCompile>
252249
<ClCompile Include="..\..\..\src\common\Int128.cpp">
253250
<Filter>common</Filter>
254251
</ClCompile>

builds/win32/msvc15/gpre_boot.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
</ItemGroup>
189189
<ItemGroup>
190190
<ClCompile Include="..\..\..\src\gpre\boot\gpre_meta_boot.cpp" />
191-
<ClCompile Include="..\..\..\src\common\classes\alloc.cpp" />
191+
<ClCompile Include="..\..\..\src\yvalve\gds.cpp" />
192192
</ItemGroup>
193193
<ItemGroup>
194194
<ProjectReference Include="common.vcxproj">

builds/win32/msvc15/gpre_boot.vcxproj.filters

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<ClCompile Include="..\..\..\src\gpre\boot\gpre_meta_boot.cpp">
1919
<Filter>source</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\..\..\src\common\gds.cpp">
21+
<ClCompile Include="..\..\..\src\yvalve\gds.cpp">
2222
<Filter>source</Filter>
2323
</ClCompile>
2424
</ItemGroup>
25-
</Project>
25+
</Project>

builds/win32/msvc15/yvalve.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<ClCompile Include="..\..\..\src\yvalve\alt.cpp" />
3131
<ClCompile Include="..\..\..\src\yvalve\config\os\win32\config_root.cpp" />
3232
<ClCompile Include="..\..\..\src\yvalve\DistributedTransaction.cpp" />
33+
<ClCompile Include="..\..\..\src\yvalve\gds.cpp" />
3334
<ClCompile Include="..\..\..\src\yvalve\keywordsStub.cpp" />
3435
<ClCompile Include="..\..\..\src\yvalve\MasterImplementation.cpp" />
3536
<ClCompile Include="..\..\..\src\yvalve\perf.cpp" />

builds/win32/msvc15/yvalve.vcxproj.filters

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<ClCompile Include="..\..\..\src\yvalve\DistributedTransaction.cpp">
3434
<Filter>source</Filter>
3535
</ClCompile>
36+
<ClCompile Include="..\..\..\src\yvalve\gds.cpp">
37+
<Filter>source</Filter>
38+
</ClCompile>
3639
<ClCompile Include="..\..\..\src\yvalve\keywordsStub.cpp">
3740
<Filter>source</Filter>
3841
</ClCompile>
@@ -149,4 +152,4 @@
149152
<Filter>GPRE files</Filter>
150153
</None>
151154
</ItemGroup>
152-
</Project>
155+
</Project>

src/utilities/install/services.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,20 @@ USHORT SERVICES_grant_access_rights(const char* service_name, const TEXT* accoun
559559
return FB_SUCCESS;
560560
}
561561

562+
//
563+
// Until the fb_assert could be converted to a function/object linked with each module
564+
// we need this ugly workaround.
565+
//
566+
extern "C" void API_ROUTINE gds__log(const TEXT* text, ...)
567+
{
568+
va_list ptr;
569+
570+
va_start(ptr, text);
571+
vprintf(text, ptr);
572+
va_end(ptr);
573+
printf("\n\n");
574+
}
575+
562576
//
563577
// EOF
564578
//
File renamed without changes.

0 commit comments

Comments
 (0)