[9336] Use single FD_SETSIZE define

* Remove unused framework/Network/SocketDefines.h * Make sure that we have single FD_SETSIZE define in code
agatho · Feb 8, 2010 · f1fb382 · f1fb382
1 parent 404c853
commit f1fb382
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 67 deletions.
diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am
@@ -42,7 +42,6 @@ EXTRA_DIST = \
 	GameSystem/TypeContainerFunctions.h \
 	GameSystem/TypeContainerFunctionsPtr.h \
 	GameSystem/TypeContainerVisitor.h \
-	Network/SocketDefines.h \
 	Platform/CompilerDefs.h \
 	Platform/Define.h \
 	Policies/CreationPolicy.h \

diff --git a/src/framework/Network/SocketDefines.h b/src/framework/Network/SocketDefines.h
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
@@ -21,13 +21,13 @@
 #ifndef _DATABASEMYSQL_H
 #define _DATABASEMYSQL_H
 
+#include "Common.h"
 #include "Database.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 
 #ifdef WIN32
-#define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <mysql/mysql.h>
 #else

diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
@@ -21,8 +21,9 @@
 #if !defined(QUERYRESULTMYSQL_H)
 #define QUERYRESULTMYSQL_H
 
+#include "Common.h"
+
 #ifdef WIN32
-#define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <mysql/mysql.h>
 #else

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9335"
+ #define REVISION_NR "9336"
 #endif // __REVISION_NR_H__
diff --git a/win/VC100/framework.vcxproj b/win/VC100/framework.vcxproj
@@ -302,7 +302,6 @@
     <ClInclude Include="..\..\src\framework\GameSystem\TypeContainer.h" />
     <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerFunctions.h" />
     <ClInclude Include="..\..\src\framework\GameSystem\TypeContainerVisitor.h" />
-    <ClInclude Include="..\..\src\framework\Network\SocketDefines.h" />
     <ClInclude Include="..\..\src\framework\Platform\CompilerDefs.h" />
     <ClInclude Include="..\..\src\framework\Platform\Define.h" />
     <ClInclude Include="..\..\src\framework\Policies\CreationPolicy.h" />

diff --git a/win/VC80/framework.vcproj b/win/VC80/framework.vcproj
@@ -607,14 +607,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Network"
-			>
-			<File
-				RelativePath="..\..\src\framework\Network\SocketDefines.h"
-				>
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj
@@ -612,14 +612,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Network"
-			>
-			<File
-				RelativePath="..\..\src\framework\Network\SocketDefines.h"
-				>
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>