diff options
author | shennetsind <ind@henn.et> | 2013-07-08 11:18:04 -0300 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-07-08 11:18:04 -0300 |
commit | 4abfdc61a3031db5701613807bcd4ecee4434a00 (patch) | |
tree | e3b7b26410202e32d1398ce6c7e89d7a5119dcf3 /src/common | |
parent | 939d15818b6f17913a12175e197ac7aea1e2e05d (diff) | |
parent | 713bc4da082e8b240ca6e0d9551c21c2931eece5 (diff) | |
download | hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.gz hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.bz2 hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.xz hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/socket.c | 1 | ||||
-rw-r--r-- | src/common/socket.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index ea8a2cfcc..f6d5849be 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -8,6 +8,7 @@ #include "../common/malloc.h" #include "../common/showmsg.h" #include "../common/strlib.h" +#include "../config/core.h" #include "socket.h" #include <stdio.h> diff --git a/src/common/socket.h b/src/common/socket.h index 0870c9d4e..82f8b84c3 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -6,7 +6,6 @@ #define _SOCKET_H_ #include "../common/cbasetypes.h" -#include "../config/core.h" #ifdef WIN32 #include "../common/winapi.h" |