--- enigma-1.01/configure.ac	2010-02-09 15:34:28.000000000 +0000
+++ enigma-1.01/configure.ac	2010-02-09 15:34:43.000000000 +0000
@@ -171,7 +171,7 @@
   AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],
       [AC_MSG_RESULT([found])],
       [AC_MSG_ERROR([not found])])      
-   AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
+   AC_CHECK_LIB(xerces-c, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
 else
   AC_MSG_CHECKING([for Xerces 3.0 experimental version])
   AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],
@@ -179,7 +179,7 @@
       xerces3exp="no")      
   if test "x$xerces3exp" = xyes; then
     AC_MSG_RESULT([found])
-    AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
+    AC_CHECK_LIB(xerces-c, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
   else
     AC_MSG_RESULT([not found])
     AC_MSG_CHECKING([for Xerces >=2.4 released version])
--- enigma-1.01/configure	2010-02-09 15:35:46.000000000 +0000
+++ enigma-1.01/configure	2010-02-09 15:35:49.000000000 +0000
@@ -14751,13 +14751,13 @@
 rm -f conftest*
 
 
-{ echo "$as_me:$LINENO: checking for main in -lxerces" >&5
-echo $ECHO_N "checking for main in -lxerces... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for main in -lxerces-c" >&5
+echo $ECHO_N "checking for main in -lxerces-c... $ECHO_C" >&6; }
 if test "${ac_cv_lib_xerces_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxerces  $LIBS"
+LIBS="-lxerces-c  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14827,7 +14827,7 @@
 #define HAVE_LIBXERCES 1
 _ACEOF
 
-  LIBS="-lxerces $LIBS"
+  LIBS="-lxerces-c $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: xerces is required to compile Enigma" >&5
@@ -14859,13 +14859,13 @@
     { echo "$as_me:$LINENO: result: found" >&5
 echo "${ECHO_T}found" >&6; }
 
-{ echo "$as_me:$LINENO: checking for main in -lxerces" >&5
-echo $ECHO_N "checking for main in -lxerces... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for main in -lxerces-c" >&5
+echo $ECHO_N "checking for main in -lxerces-c... $ECHO_C" >&6; }
 if test "${ac_cv_lib_xerces_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxerces  $LIBS"
+LIBS="-lxerces-c  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14935,7 +14935,7 @@
 #define HAVE_LIBXERCES 1
 _ACEOF
 
-  LIBS="-lxerces $LIBS"
+  LIBS="-lxerces-c $LIBS"
 
 else
   { { echo "$as_me:$LINENO: error: xerces is required to compile Enigma" >&5
--- enigma-1.01/src/lev/ScoreManager.cc	2007-09-08 13:20:01.000000000 +0100
+++ enigma-1.01/src/lev/ScoreManager.cc	2010-02-09 15:46:57.000000000 +0000
@@ -65,14 +65,14 @@
     class ScoreDomSerFilter : public DOMWriterFilter {
 #endif
         public:
-            virtual short acceptNode(const DOMNode *node) const;
+            virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode *node) const;
             virtual unsigned long getWhatToShow () const {
                 return DOMNodeFilter::SHOW_ALL;
             }
             virtual void setWhatToShow (unsigned long toShow) {}
     };
     
-    short ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
+    DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
         if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
                  std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") {
             const DOMElement *e = dynamic_cast<const DOMElement *>(node);
--- enigma-1.01/src/Utf8ToXML.cc	2010-02-09 15:48:28.000000000 +0000
+++ enigma-1.01/src/Utf8ToXML.cc	2010-02-09 15:48:04.000000000 +0000
@@ -40,11 +40,11 @@
     }
 
     void Utf8ToXML::init(const char * const toTranscode) {
-        unsigned int srcLength = std::strlen(toTranscode) + 1;
+        XMLSize_t srcLength = std::strlen(toTranscode) + 1;
         // make safe assumptions on utf-16 size
-        unsigned int maxDestLength = srcLength;
-        unsigned int charsEaten;
-        unsigned int destLength;
+        XMLSize_t maxDestLength = srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
         unsigned char *charSizes = new unsigned char[maxDestLength]; // just junk
         // make a buffer - size does not matter - the object is temporary 
         xmlString = new XMLCh[maxDestLength];
--- enigma-1.01/src/XMLtoUtf8.cc	2007-09-08 13:20:02.000000000 +0100
+++ enigma-1.01/src/XMLtoUtf8.cc	2010-02-09 15:43:18.000000000 +0000
@@ -27,11 +27,11 @@
 namespace enigma
 {
     XMLtoUtf8::XMLtoUtf8(const XMLCh* const toTranscode) {
-        unsigned int srcLength = XMLString::stringLen(toTranscode) + 1;
+        XMLSize_t srcLength = XMLString::stringLen(toTranscode) + 1;
         // make safe assumptions on utf-8 size
-        unsigned int maxDestLength = 3 * srcLength;
-        unsigned int charsEaten;
-        unsigned int destLength;
+        XMLSize_t maxDestLength = 3 * srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
         // make a buffer - size does not matter - the object is temporary 
         utf8String = new char[maxDestLength];
         // transcode to utf-8 -- there are no unrepresentable chars