--- trunk/src/utils/ElementsTable.cpp	2009/11/25 20:02:06	1390
+++ branches/development/src/utils/ElementsTable.cpp	2012/07/06 22:01:58	1767
@@ -29,20 +29,23 @@ GNU General Public License for more details.
  * @version 1.0
  */
 
-#include <iostream>
 #include "config.h"
+
+#include <iostream>
 #include <cstdlib>
 #include <string>
 #include <fstream>
 #include <cstdlib>
 #include "utils/ElementsTable.hpp"
 #include "utils/simError.h"
-#include "io/basic_ifstrstream.hpp"
+#include "io/ifstrstream.hpp"
 
-#if !HAVE_STRNCASECMP
-extern "C" int strncasecmp(const char *s1, const char *s2, size_t n);
+#ifdef _MSC_VER
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
 #endif
 
+
 #ifdef WIN32
 #define FILE_SEP_CHAR "\\"
 #else
@@ -59,7 +62,7 @@ namespace OpenMD {
 
   ElementsTable::ElementsTable() {
     init_ = false;
-    STR_DEFINE(dir_, FRC_PATH );
+    dir_ = std::string("TO_STRING(FRC_PATH)");
     envvar_ = "FORCE_PARAM_PATH";
     filename_ = "element.txt";
   }