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/utils | |
| 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/utils')
| -rw-r--r-- | src/utils/copynpaste.cpp | 2 | ||||
| -rw-r--r-- | src/utils/mkdir.cpp | 8 | ||||
| -rw-r--r-- | src/utils/specialfolder.cpp | 2 | ||||
| -rw-r--r-- | src/utils/specialfolder.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 3d2e3b80..458a6d27 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -35,7 +35,7 @@ #include <SDL_syswm.h> #include "copynpaste.h" -#ifdef WIN32 +#ifdef _WIN32 bool RetrieveBuffer(std::string& text, std::string::size_type& pos) { bool ret = false; diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp index 75ab8595..ee40488e 100644 --- a/src/utils/mkdir.cpp +++ b/src/utils/mkdir.cpp @@ -22,7 +22,7 @@ #include <cstring> #include <cerrno> -#if defined WIN32 +#if defined _WIN32 #include <windows.h> #endif @@ -51,7 +51,7 @@ int mkdir_r(const char *pathname) { } for (p=tmp; *p; p++) { -#if defined WIN32 +#if defined _WIN32 if (*p == '/' || *p == '\\') #else if (*p == '/') @@ -77,13 +77,13 @@ int mkdir_r(const char *pathname) { return -1; } -#if defined WIN32 +#if defined _WIN32 if (!CreateDirectory(tmp, 0)) #else if (mkdir(tmp, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) #endif { -#if defined WIN32 +#if defined _WIN32 // hack, hack. just assume that x: might be a drive // letter, and try again if (!(strlen(tmp) == 2 && diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp index 63337578..0c82ce68 100644 --- a/src/utils/specialfolder.cpp +++ b/src/utils/specialfolder.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef WIN32 +#ifdef _WIN32 #include "specialfolder.h" #include <windows.h> diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h index eef6416b..0c3e999c 100644 --- a/src/utils/specialfolder.h +++ b/src/utils/specialfolder.h @@ -21,7 +21,7 @@ #ifndef SPECIALFOLDER_H #define SPECIALFOLDER_H -#ifdef WIN32 +#ifdef _WIN32 #include <shlobj.h> #include <string> std::string getSpecialFolderLocation(int folderId); |