Index: af/util/xp/ut_go_file.cpp
===================================================================
--- af/util/xp/ut_go_file.cpp	(revision 30683)
+++ af/util/xp/ut_go_file.cpp	(working copy)
@@ -451,7 +451,7 @@
 					isdir = TRUE;
 					break;
 				case UT_GO_DOTDOT_TEST: {
-#if GLIB_CHECK_VERSION(2,26,0) || defined(G_OS_WIN32)
+#if GLIB_CHECK_VERSION(2,26,0) 
 					GStatBuf statbuf;
 #else
 					struct stat statbuf;
@@ -1406,7 +1406,7 @@
 	return FALSE;
 #else
 
-#if GLIB_CHECK_VERSION(2,26,0) || defined(G_OS_WIN32)
+#if GLIB_CHECK_VERSION(2,26,0) 
 	GStatBuf file_stat;
 #else
 	struct stat file_stat;
@@ -1617,7 +1617,7 @@
 
 	gnome_vfs_file_info_unref (file_info);
 #else
-#if GLIB_CHECK_VERSION(2,26,0) || defined(G_OS_WIN32)
+#if GLIB_CHECK_VERSION(2,26,0) 
 	GStatBuf file_stat;
 #else
 	struct stat file_stat;
Index: af/util/xp/ut_std_string.cpp
===================================================================
--- af/util/xp/ut_std_string.cpp	(revision 30683)
+++ af/util/xp/ut_std_string.cpp	(working copy)
@@ -390,6 +390,7 @@
         std::string format = *iter;
         struct tm tm;
         memset( &tm, 0, sizeof(struct tm));
+		//strptime is not defined in windows
         const char* rc = strptime( datestr, format.c_str(), &tm );
         if( rc == eos )
         {
Index: text/ptbl/xp/pd_DocumentRDF.cpp
===================================================================
--- text/ptbl/xp/pd_DocumentRDF.cpp	(revision 30683)
+++ text/ptbl/xp/pd_DocumentRDF.cpp	(working copy)
@@ -93,6 +93,7 @@
     }
     virtual std::pair< PT_DocPosition, PT_DocPosition > runInsertReferenceDialog( FV_View* pView )
     {
+		// need return in virtual function, please help add a correct one
     }
 };
 static PD_RDFDialogs* s_RDFDialogs = new PD_RDFDialogsNull;
@@ -104,7 +105,7 @@
 
 std::pair< PT_DocPosition, PT_DocPosition > runInsertReferenceDialog( FV_View* pView )
 {
-    s_RDFDialogs->runInsertReferenceDialog( pView );
+    return s_RDFDialogs->runInsertReferenceDialog( pView );
 }
 
 void runSemanticStylesheetsDialog( FV_View* pView )
@@ -4999,7 +5000,7 @@
     if( !pView )
         return;
 
-    for( std::set< std::string >::iterator iter = xmlids.begin(); iter != xmlids.end(); ++iter )
+    for(std::set< std::string >::const_iterator iter = xmlids.begin(); iter != xmlids.end(); ++iter )
     {
         std::string xmlid = *iter;
         std::pair< PT_DocPosition, PT_DocPosition > range = getIDRange( xmlid );