Merge branch 'fredb/winfix'

[simgear.git] / simgear / xml / xmltok.c

diff --git a/simgear/xml/xmltok.c b/simgear/xml/xmltok.c
index 8d058d41e580c7cd4af341fd4d2a08cee2a925ba..daca383d01f1484e0993b05a6d6e9cc1c431a80e 100644 (file)
--- a/simgear/xml/xmltok.c
+++ b/simgear/xml/xmltok.c
@@ -1365,6 +1365,10 @@ int getEncodingIndex(const char *name)
   for (i = 0; i < sizeof(encodingNames)/sizeof(encodingNames[0]); i++)
     if (streqci(name, encodingNames[i]))
       return i;
+      
+  if (streqci(name, "ASCII"))
+    return US_ASCII_ENC;
+    
   return UNKNOWN_ENC;
 }
 
@@ -1491,7 +1495,7 @@ int initScan(const ENCODING **encodingTable,
       break;
     }
   }
-  *encPtr = encodingTable[INIT_ENC_INDEX(enc)];
+  *encPtr = encodingTable[(int)INIT_ENC_INDEX(enc)];
   return XmlTok(*encPtr, state, ptr, end, nextTokPtr);
 }