[Spread-cvs] commit: r304 - in trunk: daemon libspread win32
jgreen at spread.org
jgreen at spread.org
Mon Feb 20 16:05:16 EST 2006
Author: jgreen
Date: 2006-02-20 16:05:16 -0500 (Mon, 20 Feb 2006)
New Revision: 304
Modified:
trunk/daemon/events.c
trunk/libspread/sp.c
trunk/win32/flush_user.vcproj
trunk/win32/libspread-core.vcproj
trunk/win32/libspread.vcproj
trunk/win32/libtspread-core.vcproj
trunk/win32/spflooder.vcproj
trunk/win32/spread.sln
trunk/win32/spread.vcproj
trunk/win32/sprecv.vcproj
trunk/win32/spsend.vcproj
trunk/win32/sptmonitor.vcproj
trunk/win32/sptuser.vcproj
trunk/win32/spuser.vcproj
Log:
updated win32 project files, fixed 2 win32 compiler warnings in events.c and sp.c
Modified: trunk/daemon/events.c
===================================================================
--- trunk/daemon/events.c 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/daemon/events.c 2006-02-20 21:05:16 UTC (rev 304)
@@ -126,8 +126,8 @@
sp_time E_get_time(void)
{
+#ifndef ARCH_PC_WIN95
struct timeval read_time;
-#ifndef ARCH_PC_WIN95
#if HAVE_STRUCT_TIMEZONE
struct timezone dummy_tz;
Modified: trunk/libspread/sp.c
===================================================================
--- trunk/libspread/sp.c 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/libspread/sp.c 2006-02-20 21:05:16 UTC (rev 304)
@@ -303,7 +303,7 @@
sp_time start_time, temp_time, target_time, wait_time;
struct timeval sel_time;
int non_blocking = 0;
- int err;
+ int err = 0;
int on;
int ret_ioctl;
sockopt_len_t elen;
Modified: trunk/win32/flush_user.vcproj
===================================================================
--- trunk/win32/flush_user.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/flush_user.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -38,7 +38,7 @@
AdditionalDependencies="libspread.lib Ws2_32.lib"
OutputFile="$(OutDir)/flush_user.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\lib\win32"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/flush_user.pdb"
SubSystem="1"
@@ -60,7 +60,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -87,8 +87,8 @@
AdditionalDependencies="libspread.lib Ws2_32.lib"
OutputFile="$(OutDir)/flush_user.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
- GenerateDebugInformation="TRUE"
+ AdditionalLibraryDirectories="..\lib\win32"
+ GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -117,10 +117,6 @@
RelativePath="..\examples\fl_user.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/libspread-core.vcproj
===================================================================
--- trunk/win32/libspread-core.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/libspread-core.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\lib"
+ OutputDirectory="..\lib\win32"
IntermediateDirectory="Debug"
ConfigurationType="4"
CharacterSet="2">
@@ -50,7 +50,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\lib"
+ OutputDirectory="..\lib\win32"
IntermediateDirectory="Release"
ConfigurationType="4"
CharacterSet="2">
@@ -109,10 +109,6 @@
RelativePath="..\libspread\sp.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/libspread.vcproj
===================================================================
--- trunk/win32/libspread.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/libspread.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\lib"
+ OutputDirectory="..\lib\win32"
IntermediateDirectory="Debug"
ConfigurationType="4"
CharacterSet="2">
@@ -50,7 +50,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\lib"
+ OutputDirectory="..\lib\win32"
IntermediateDirectory="Release"
ConfigurationType="4"
CharacterSet="2">
@@ -155,10 +155,6 @@
</File>
</Filter>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/libtspread-core.vcproj
===================================================================
--- trunk/win32/libtspread-core.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/libtspread-core.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\lib"
+ OutputDirectory="..\lib\win32"
IntermediateDirectory="Debug"
ConfigurationType="4"
CharacterSet="2">
@@ -50,7 +50,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\lib"
+ OutputDirectory="..\lib\win32"
IntermediateDirectory="Release"
ConfigurationType="4"
CharacterSet="2">
@@ -109,10 +109,6 @@
RelativePath="..\libspread\sp.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/spflooder.vcproj
===================================================================
--- trunk/win32/spflooder.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/spflooder.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -37,7 +37,7 @@
AdditionalDependencies="libspread-core.lib Ws2_32.lib"
OutputFile="$(OutDir)/spflooder.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\lib\win32"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/spflooder.pdb"
SubSystem="1"
@@ -59,7 +59,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -86,8 +86,8 @@
AdditionalDependencies="libspread-core.lib Ws2_32.lib"
OutputFile="$(OutDir)/spflooder.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
- GenerateDebugInformation="TRUE"
+ AdditionalLibraryDirectories="..\lib\win32"
+ GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -116,10 +116,6 @@
RelativePath="..\examples\flooder.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/spread.sln
===================================================================
--- trunk/win32/spread.sln 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/spread.sln 2006-02-20 21:05:16 UTC (rev 304)
@@ -27,6 +27,10 @@
ConfigName.1 = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
+ {6012883E-3670-40AD-B86F-E743F0B685CA}.0 = {EE70513E-C9C9-48E4-B755-0A3E2BA67EAC}
+ {112A90EA-43CD-4AA8-A643-7EBE9621682B}.0 = {7246DB18-3A39-4BDE-AD6B-E1005AC97BAC}
+ {6203486C-3DF4-4C17-B029-1BE1111B7344}.0 = {EE70513E-C9C9-48E4-B755-0A3E2BA67EAC}
+ {AD47C277-A7FA-410F-8869-F9D97104B9D7}.0 = {7246DB18-3A39-4BDE-AD6B-E1005AC97BAC}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{6012883E-3670-40AD-B86F-E743F0B685CA}.Debug.ActiveCfg = Debug|Win32
Modified: trunk/win32/spread.vcproj
===================================================================
--- trunk/win32/spread.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/spread.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -34,7 +34,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="Ws2_32.lib"
OutputFile="$(OutDir)/spread.exe"
LinkIncremental="2"
GenerateDebugInformation="TRUE"
@@ -58,7 +58,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -82,7 +82,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="Ws2_32.lib"
OutputFile="$(OutDir)/spread.exe"
LinkIncremental="1"
GenerateDebugInformation="FALSE"
@@ -208,10 +208,6 @@
</File>
</Filter>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/sprecv.vcproj
===================================================================
--- trunk/win32/sprecv.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/sprecv.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -58,7 +58,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -126,10 +126,6 @@
RelativePath="..\daemon\r.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/spsend.vcproj
===================================================================
--- trunk/win32/spsend.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/spsend.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -58,7 +58,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -129,10 +129,6 @@
RelativePath="..\daemon\s.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/sptmonitor.vcproj
===================================================================
--- trunk/win32/sptmonitor.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/sptmonitor.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -58,7 +58,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -141,10 +141,6 @@
RelativePath="..\daemon\y.tab.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/sptuser.vcproj
===================================================================
--- trunk/win32/sptuser.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/sptuser.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_REENTRANT;ARCH_PC_WIN95"
MinimalRebuild="TRUE"
ExceptionHandling="FALSE"
BasicRuntimeChecks="3"
@@ -37,7 +37,7 @@
AdditionalDependencies="libspread.lib Ws2_32.lib"
OutputFile="$(OutDir)/sptuser.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\lib\win32"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/sptuser.pdb"
SubSystem="1"
@@ -59,7 +59,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -69,7 +69,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="..\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_REENTRANT;ARCH_PC_WIN95"
StringPooling="TRUE"
ExceptionHandling="FALSE"
RuntimeLibrary="0"
@@ -86,8 +86,8 @@
AdditionalDependencies="libspread.lib Ws2_32.lib"
OutputFile="$(OutDir)/sptuser.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
- GenerateDebugInformation="TRUE"
+ AdditionalLibraryDirectories="..\lib\win32"
+ GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -116,10 +116,6 @@
RelativePath="..\examples\user.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
Modified: trunk/win32/spuser.vcproj
===================================================================
--- trunk/win32/spuser.vcproj 2006-02-20 18:35:35 UTC (rev 303)
+++ trunk/win32/spuser.vcproj 2006-02-20 21:05:16 UTC (rev 304)
@@ -12,7 +12,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Debug"
ConfigurationType="1"
CharacterSet="2">
@@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARCH_PC_WIN95"
MinimalRebuild="TRUE"
ExceptionHandling="FALSE"
BasicRuntimeChecks="3"
@@ -37,7 +37,7 @@
AdditionalDependencies="Ws2_32.lib libspread-core.lib"
OutputFile="$(OutDir)/spuser.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\lib"
+ AdditionalLibraryDirectories="..\lib\win32"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/spuser.pdb"
SubSystem="1"
@@ -59,7 +59,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\bin"
+ OutputDirectory="..\bin\win32"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
@@ -69,7 +69,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="..\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARCH_PC_WIN95"
StringPooling="TRUE"
ExceptionHandling="FALSE"
RuntimeLibrary="4"
@@ -86,8 +86,8 @@
AdditionalDependencies="Ws2_32.lib libspread-core.lib"
OutputFile="$(OutDir)/spuser.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\lib"
- GenerateDebugInformation="TRUE"
+ AdditionalLibraryDirectories="..\lib\win32"
+ GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -116,10 +116,6 @@
RelativePath="..\examples\user.c">
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
</Files>
<Globals>
</Globals>
More information about the Spread-cvs
mailing list