Index: /OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp (revision 10024)
+++ /OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp (revision 10129)
@@ -88,5 +88,5 @@
 #define OSGDB_FILENAME_TEXT(x) L ## x
 #define OSGDB_WINDOWS_FUNCT(x) x ## W
-#define OSGDB_WINDOWS_FUNCT_STRING(x) L ## #x L"W"
+#define OSGDB_WINDOWS_FUNCT_STRING(x) #x "W"
 typedef wchar_t filenamechar;
 typedef std::wstring filenamestring;
@@ -664,5 +664,5 @@
             {
                 HMODULE thisModule = 0;
-                static char static_variable = 0;    // Variable that is located in DLL address space.
+                static filenamechar static_variable = 0;    // Variable that is located in DLL address space.
 
                 if( pGetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, &static_variable, &thisModule) )