diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-05 14:50:07 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-05 14:50:07 +0000 |
| commit | 28eedb41600c4c6617cd38905b3e55c879180754 (patch) | |
| tree | f3309c45f09acdba5144185b51d91f4a51b0b2f9 /src/common/timer.c | |
| parent | a79359182bb925d2f64dc82adccbf4333cdcd01d (diff) | |
| download | hercules-28eedb41600c4c6617cd38905b3e55c879180754.tar.gz hercules-28eedb41600c4c6617cd38905b3e55c879180754.tar.bz2 hercules-28eedb41600c4c6617cd38905b3e55c879180754.tar.xz hercules-28eedb41600c4c6617cd38905b3e55c879180754.zip | |
* Removed the dependency on winsock.h for definitions, it's all winsock2.h now.
* Minor documentation/re-coding in chat.c.
* More work on ticket #41.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10471 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/timer.c')
| -rw-r--r-- | src/common/timer.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/common/timer.c b/src/common/timer.c index 6c228839c..09be7d949 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -3,11 +3,17 @@ #include <sys/types.h> -#ifdef __WIN32 -#define __USE_W32_SOCKETS +#include "../common/cbasetypes.h" +#include "../common/malloc.h" +#include "../common/showmsg.h" +#include "timer.h" + +#ifdef WIN32 +//#define __USE_W32_SOCKETS // Well, this won't last another 30++ years (where conversion will truncate). //#define _USE_32BIT_TIME_T // use 32 bit time variables on 64bit windows -#include <windows.h> +//#include <windows.h> +#include <winsock2.h> #else #include <sys/socket.h> #include <sys/time.h> @@ -18,11 +24,6 @@ #include <string.h> #include <time.h> -#include "../common/cbasetypes.h" -#include "../common/malloc.h" -#include "../common/showmsg.h" -#include "timer.h" - // タイマー間隔の最小値。モンスターの大量召還時、多数のクライアント接続時に // サーバーが反応しなくなる場合は、TIMER_MIN_INTERVAL を増やしてください。 |