diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2007-01-14 22:29:06 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2007-01-14 22:29:06 +0000 |
| commit | 2a7e2e34e85abd33b41499420565e988c26ca062 (patch) | |
| tree | ecf0c5a741deb3cd2e4f6f2412e9a32e8eb7b37e /src | |
| parent | f842e0b40d8382011f0bc46b1446945d99ac0425 (diff) | |
| download | mana-2a7e2e34e85abd33b41499420565e988c26ca062.tar.gz mana-2a7e2e34e85abd33b41499420565e988c26ca062.tar.bz2 mana-2a7e2e34e85abd33b41499420565e988c26ca062.tar.xz mana-2a7e2e34e85abd33b41499420565e988c26ca062.zip | |
Fixed windows headers issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/updatewindow.cpp | 5 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 86d0a57c..628082d0 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -28,8 +28,6 @@ #include <SDL_thread.h> #include <zlib.h> -#include <curl/curl.h> - #include <guichan/widgets/label.hpp> #include "browserbox.h" @@ -37,6 +35,9 @@ #include "progressbar.h" #include "scrollarea.h" +// Curl should be included after Guichan to avoid Windows redefinitions +#include <curl/curl.h> + #include "../configuration.h" #include "../log.h" #include "../main.h" diff --git a/src/main.cpp b/src/main.cpp index 8c70d62f..08fe693a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,8 +39,6 @@ #if (defined __USE_UNIX98 || defined __FreeBSD__) #include <cerrno> #include <sys/stat.h> -#elif defined WIN32 -#define NOGDI #endif #include "configuration.h" |