diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-16 20:08:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-16 20:08:39 +0300 |
| commit | 9e3635a6fdb0e71301a66a7561830013754645fa (patch) | |
| tree | fca9c40efc78270472e39b7d3b084b36b4e25154 | |
| parent | ed93eed717eaa23543d089236ac1b09c4d152b54 (diff) | |
| download | manaverse-9e3635a6fdb0e71301a66a7561830013754645fa.tar.gz manaverse-9e3635a6fdb0e71301a66a7561830013754645fa.tar.bz2 manaverse-9e3635a6fdb0e71301a66a7561830013754645fa.tar.xz manaverse-9e3635a6fdb0e71301a66a7561830013754645fa.zip | |
Fix some more wrong includes.
| -rw-r--r-- | src/utils/sdlhelper.cpp | 4 | ||||
| -rw-r--r-- | src/utils/xml/libxml.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp index bdb6dbd4e..2e0b51e54 100644 --- a/src/utils/sdlhelper.cpp +++ b/src/utils/sdlhelper.cpp @@ -26,9 +26,9 @@ #include "utils/stringutils.h" -#ifdef USE_X11 +#if defined(USE_X11) && defined(USE_OPENGL) #include "utils/glxhelper.h" -#endif // USE_X11 +#endif // defined(USE_X11) && defined(USE_OPENGL) #include <SDL_syswm.h> #include <SDL_video.h> diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h index e808bc3e2..ca8c99639 100644 --- a/src/utils/xml/libxml.h +++ b/src/utils/xml/libxml.h @@ -32,7 +32,9 @@ #include "utils/xml/libxml.inc" +#ifndef _GLIBCXX_STRING #include <string> +#endif // _GLIBCXX_STRING #include "localconsts.h" |