Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-14 19:16:53 +01:00
commit 37424fdef4
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
code/nel/src/net/stdnet.h
View file

@ -14,17 +14,24 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef NL_STDNET_H
#define NL_STDNET_H
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# define _WIN32_WINDOWS 0x0500 # define WIN32_LEAN_AND_MEAN
# define _WIN32_WINDOWS 0x0500
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0500
# endif
# ifndef NL_COMP_MINGW # ifndef NL_COMP_MINGW
# define WINVER 0x0500 # define WINVER 0x0500
# define NOMINMAX # define NOMINMAX
# endif # endif
# include <winsock2.h> # include <WinSock2.h>
# include <windows.h> # include <Windows.h>
#endif // NL_OS_WINDOWS #endif
#include <map> #include <map>
#include <set> #include <set>
@ -49,7 +56,6 @@
#include <errno.h> #include <errno.h>
#include "nel/misc/debug.h" #include "nel/misc/debug.h"
#include "nel/misc/common.h" #include "nel/misc/common.h"
#include "nel/misc/stream.h" #include "nel/misc/stream.h"
#include "nel/misc/time_nl.h" #include "nel/misc/time_nl.h"
@ -57,3 +63,5 @@
#include "nel/misc/variable.h" #include "nel/misc/variable.h"
#include "nel/misc/mem_stream.h" #include "nel/misc/mem_stream.h"
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#endif