diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/chatlog.cpp | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/chatlog.cpp')
| -rw-r--r-- | src/chatlog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chatlog.cpp b/src/chatlog.cpp index f33b1aff..011fa3aa 100644 --- a/src/chatlog.cpp +++ b/src/chatlog.cpp @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/time.h> -#ifdef WIN32 +#ifdef _WIN32 #include <windows.h> #elif defined __APPLE__ #include <Carbon/Carbon.h> @@ -167,7 +167,7 @@ void ChatLogger::setServerName(const std::string &serverName) void ChatLogger::makeDir(const std::string &dir) { -#ifdef WIN32 +#ifdef _WIN32 mkdir(dir.c_str()); #else mkdir(dir.c_str(), 0750); |