[9336] Use single FD_SETSIZE define

* Remove unused framework/Network/SocketDefines.h
* Make sure that we have single FD_SETSIZE define in code

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 \

src/framework/Network/SocketDefines.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MANGOS_SOCKETDEFINES_H
-#define MANGOS_SOCKETDEFINES_H
-
-#ifdef WIN32
-
-/* Windows socket definitions
- */
-#define FD_SETSIZE 1024
-#include <winsock2.h>
-#include <Ws2tcpip.h>
-
-typedef SOCKET SocketHandle;
-typedef fd_set SelectSet;
-
-#else
-
-/* The unix socket definitions
- */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef __APPLE_CC__
-#include <sys/select.h>
-#endif
-
-typedef int SocketHandle;
-typedef fd_set SelectSet;
-#endif
-#endif

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

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

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__

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" />

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>

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>