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.h | |
| 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.h')
| -rw-r--r-- | src/common/timer.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/common/timer.h b/src/common/timer.h index 23cb6beaa..24534de2a 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -4,10 +4,15 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#ifdef __WIN32 +#ifndef _CBASETYPES_H_ +#include "../common/cbasetypes.h" +#endif + +#ifdef WIN32 /* We need winsock lib to have timeval struct - windows is weirdo */ -#define __USE_W32_SOCKETS -#include <windows.h> +//#define __USE_W32_SOCKETS +//#include <windows.h> +#include <winsock2.h> #endif #define BASE_TICK 5 |