Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[54076] firebird/trunk
|
From: <hv...@us...> - 2012-03-01 18:18:53
|
Revision: 54076
http://firebird.svn.sourceforge.net/firebird/?rev=54076&view=rev
Author: hvlad
Date: 2012-03-01 18:18:46 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Fixed Windows build
Modified Paths:
--------------
firebird/trunk/builds/win32/msvc10/yvalve.vcxproj
firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters
firebird/trunk/src/common/thd.h
firebird/trunk/src/iscguard/iscguard.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/remote/remote.h
firebird/trunk/src/yvalve/MasterImplementation.cpp
firebird/trunk/src/yvalve/utl.cpp
Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2012-03-01 18:18:46 UTC (rev 54076)
@@ -24,6 +24,7 @@
<ClCompile Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.cpp" />
<ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.cpp" />
<ClCompile Include="..\..\..\src\jrd\os\win32\ibinitdll.cpp" />
+ <ClCompile Include="..\..\..\src\plugins\crypt\arc4\Arc4.cpp" />
<ClCompile Include="..\..\..\src\remote\client\interface.cpp" />
<ClCompile Include="..\..\..\src\yvalve\alt.cpp" />
<ClCompile Include="..\..\..\src\yvalve\DistributedTransaction.cpp" />
@@ -41,6 +42,7 @@
<ClInclude Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.h" />
<ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.h" />
<ClInclude Include="..\..\..\src\auth\trusted\AuthSspi.h" />
+ <ClInclude Include="..\..\..\src\plugins\crypt\arc4\Arc4.h" />
<ClInclude Include="..\..\..\src\yvalve\alt_proto.h" />
<ClInclude Include="..\..\..\src\yvalve\array_proto.h" />
<ClInclude Include="..\..\..\src\yvalve\blob_proto.h" />
Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2012-03-01 18:18:46 UTC (rev 54076)
@@ -75,6 +75,9 @@
<ClCompile Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.cpp">
<Filter>Auth</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\plugins\crypt\arc4\Arc4.cpp">
+ <Filter>source</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\yvalve\why_proto.h">
@@ -122,6 +125,9 @@
<ClInclude Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.h">
<Filter>headers</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\plugins\crypt\arc4\Arc4.h">
+ <Filter>headers</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
Modified: firebird/trunk/src/common/thd.h
===================================================================
--- firebird/trunk/src/common/thd.h 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/src/common/thd.h 2012-03-01 18:18:46 UTC (rev 54076)
@@ -36,7 +36,7 @@
#ifdef WIN_NT
#include <windows.h>
-typedef HANDLE ThreadId;
+typedef DWORD ThreadId;
#endif
#ifdef USE_POSIX_THREADS
Modified: firebird/trunk/src/iscguard/iscguard.cpp
===================================================================
--- firebird/trunk/src/iscguard/iscguard.cpp 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/src/iscguard/iscguard.cpp 2012-03-01 18:18:46 UTC (rev 54076)
@@ -249,7 +249,7 @@
*
**************************************/
- ThreadId thread_id = 0;
+ Thread::Handle thread_id = 0;
// If we're a service, don't create a window
if (service_flag)
@@ -376,7 +376,7 @@
static BOOL bInTaskBar = FALSE;
static bool bStartup = false;
static HINSTANCE hInstance = NULL;
- static ThreadId thread_id;
+ static Thread::Handle thread_id;
static UINT s_uTaskbarRestart;
hInstance = (HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/src/jrd/jrd.cpp 2012-03-01 18:18:46 UTC (rev 54076)
@@ -3941,7 +3941,7 @@
{
Semaphore shutdown_semaphore;
- ThreadId h;
+ Thread::Handle h;
Thread::start(shutdown_thread, &shutdown_semaphore, THREAD_medium, &h);
if (!shutdown_semaphore.tryEnter(0, timeout))
Modified: firebird/trunk/src/remote/remote.h
===================================================================
--- firebird/trunk/src/remote/remote.h 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/src/remote/remote.h 2012-03-01 18:18:46 UTC (rev 54076)
@@ -843,7 +843,7 @@
SOCKET port_channel; // handle for connection (from by OS)
struct linger port_linger; // linger value as defined by SO_LINGER
Rdb* port_context;
- ThreadId port_events_thread; // handle of thread, handling incoming events
+ Thread::Handle port_events_thread; // handle of thread, handling incoming events
void (*port_events_shutdown)(rem_port*); // hack - avoid changing API at beta stage
#ifdef WIN_NT
HANDLE port_pipe; // port pipe handle
Modified: firebird/trunk/src/yvalve/MasterImplementation.cpp
===================================================================
--- firebird/trunk/src/yvalve/MasterImplementation.cpp 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/src/yvalve/MasterImplementation.cpp 2012-03-01 18:18:46 UTC (rev 54076)
@@ -436,7 +436,7 @@
GlobalPtr<Semaphore> timerWakeup;
// Should use atomic flag for thread stop to provide correct membar
AtomicCounter stopTimerThread(0);
-ThreadId timerThreadHandle = 0;
+Thread::Handle timerThreadHandle = 0;
struct TimerEntry
{
Modified: firebird/trunk/src/yvalve/utl.cpp
===================================================================
--- firebird/trunk/src/yvalve/utl.cpp 2012-03-01 17:13:11 UTC (rev 54075)
+++ firebird/trunk/src/yvalve/utl.cpp 2012-03-01 18:18:46 UTC (rev 54076)
@@ -2132,7 +2132,7 @@
int rc = 0;
try
{
- Thread::start((ThreadEntryPoint*) entrypoint, arg, priority, (ThreadId*) thd_id);
+ Thread::start((ThreadEntryPoint*) entrypoint, arg, priority, (Thread::Handle*) thd_id);
}
catch (const Firebird::status_exception& status)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
