summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/configuration.cpp7
-rw-r--r--src/resources/itemmanager.cpp8
-rw-r--r--src/resources/mapreader.cpp7
4 files changed, 6 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ca983f7..4d23aba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.