diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-08-17 18:58:53 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-08-17 18:58:53 +0000 |
| commit | b0867dde000892f1aab803bf7d06a51d799baf43 (patch) | |
| tree | f60dba0755318b34e7f83bb908bc3f08e5051491 | |
| parent | 9e11a93d3b7281c4927357ce8be4a2f3dd7c88e0 (diff) | |
| download | mana-b0867dde000892f1aab803bf7d06a51d799baf43.tar.gz mana-b0867dde000892f1aab803bf7d06a51d799baf43.tar.bz2 mana-b0867dde000892f1aab803bf7d06a51d799baf43.tar.xz mana-b0867dde000892f1aab803bf7d06a51d799baf43.zip | |
Removed special #ifdefs for libxml2 linking issues in Win32.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/configuration.cpp | 7 | ||||
| -rw-r--r-- | src/resources/itemmanager.cpp | 8 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 7 |
4 files changed, 6 insertions, 22 deletions
@@ -1,3 +1,9 @@ +2005-08-17 Eugenio Favalli <elvenprogrammer@gmail.com> + + * src/configuration.cpp, src/resources/itemmanager.cpp, + src/resources/mapreader.cpp: Removed special #ifdefs for libxml2 linking + issues in Win32. + 2005-08-16 FERREIRA Yohann <bertram@cegetel.net> * src/gui/window.h, src/gui/window.cpp: diff --git a/src/configuration.cpp b/src/configuration.cpp index 6c1a57c5..e8e673b3 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -35,13 +35,6 @@ #include "configlistener.h" #include "log.h" -// MSVC libxml2 at the moment doesn't work right when using MinGW, missing this -// function at link time. -#ifdef WIN32 -#undef xmlFree -#define xmlFree(x) ; -#endif - void Configuration::init(const std::string &filename) { configPath = filename; diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp index 6593516f..f56968cf 100644 --- a/src/resources/itemmanager.cpp +++ b/src/resources/itemmanager.cpp @@ -29,14 +29,6 @@ #include "../log.h" -// MSVC libxml2 at the moment doesn't work right when using MinGW, missing this -// function at link time. -#ifdef WIN32 -#undef xmlFree -#define xmlFree(x) ; -#endif - - ItemManager::ItemManager() { ResourceManager *resman = ResourceManager::getInstance(); diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 2b8c7ab6..5e83f34f 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -38,13 +38,6 @@ const unsigned int DEFAULT_TILE_WIDTH = 32; const unsigned int DEFAULT_TILE_HEIGHT = 32; -// MSVC libxml2 at the moment doesn't work right when using MinGW, missing this -// function at link time. -#ifdef WIN32 -#undef xmlFree -#define xmlFree(x) ; -#endif - /** * Inflates either zlib or gzip deflated memory. The inflated memory is * expected to be freed by the caller. |