Index: dumpcap.c
===================================================================
--- dumpcap.c	(revision 20660)
+++ dumpcap.c	(working copy)
@@ -98,7 +98,7 @@
         "Dumpcap " VERSION "%s\n"
         "Capture network packets and dump them into a libpcap file.\n"
         "See http://www.wireshark.org for more information.\n",
-        svnversion);
+        wireshark_svnversion);
   } else {
     output = stderr;
   }
@@ -149,7 +149,7 @@
         "%s\n"
         "%s\n"
         "See http://www.wireshark.org for more information.\n",
-        svnversion, get_copyright_info() ,comp_info_str->str, runtime_info_str->str);
+        wireshark_svnversion, get_copyright_info() ,comp_info_str->str, runtime_info_str->str);
 }
 
 /*
Index: version_info.c
===================================================================
--- version_info.c	(revision 20660)
+++ version_info.c	(working copy)
@@ -75,9 +75,9 @@
 #endif
 
 #ifdef SVNVERSION
-	const char *svnversion = " (" SVNVERSION ")";
+	const char *wireshark_svnversion = " (" SVNVERSION ")";
 #else
-	const char *svnversion = "";
+	const char *wireshark_svnversion = "";
 #endif
 
 /*
Index: version_info.h
===================================================================
--- version_info.h	(revision 20660)
+++ version_info.h	(working copy)
@@ -33,7 +33,7 @@
 /*
  * The svn version string or ""
  */
-extern const gchar *svnversion;
+extern const gchar *wireshark_svnversion;
 
 /*
  * Get various library compile-time versions and append them to
Index: gtk/main.c
===================================================================
--- gtk/main.c	(revision 20660)
+++ gtk/main.c	(working copy)
@@ -1199,7 +1199,7 @@
         "See http://www.wireshark.org for more information.\n"
         "\n"
         "%s",
-	svnversion, get_copyright_info());
+	wireshark_svnversion, get_copyright_info());
   } else {
     output = stderr;
   }
@@ -1286,7 +1286,7 @@
          "%s"
          "\n"
          "%s",
-      svnversion, get_copyright_info(), comp_info_str->str,
+      wireshark_svnversion, get_copyright_info(), comp_info_str->str,
       runtime_info_str->str);
 
 #ifdef _WIN32
Index: gtk/about_dlg.c
===================================================================
--- gtk/about_dlg.c	(revision 20660)
+++ gtk/about_dlg.c	(working copy)
@@ -163,7 +163,7 @@
        "Wireshark is Open Source Software released under the GNU General Public License.\n"
        "\n"
        "Check the man page and http://www.wireshark.org for more information.",
-       svnversion, get_copyright_info(), comp_info_str->str,
+       wireshark_svnversion, get_copyright_info(), comp_info_str->str,
        runtime_info_str->str);
 
   msg_label = gtk_label_new(message);
Index: tshark.c
===================================================================
--- tshark.c	(revision 20660)
+++ tshark.c	(working copy)
@@ -221,7 +221,7 @@
         "See http://www.wireshark.org for more information.\n"
         "\n"
         "%s",
-	svnversion, get_copyright_info());
+	wireshark_svnversion, get_copyright_info());
   } else {
     output = stderr;
   }
@@ -1071,7 +1071,7 @@
                "%s"
                "\n"
                "%s",
-               svnversion, get_copyright_info(), comp_info_str->str,
+               wireshark_svnversion, get_copyright_info(), comp_info_str->str,
                runtime_info_str->str);
         exit(0);
         break;
Index: epan/dfilter/dfilter-macro.c
===================================================================
--- epan/dfilter/dfilter-macro.c	(revision 20660)
+++ epan/dfilter/dfilter-macro.c	(working copy)
@@ -514,9 +514,6 @@
 								"text", PT_TXTMOD_STRING, macro_text_chk, macro_text_set, macro_text_tostr,
 								NULL );
 	
-	if(error) {
-		report_failure("error while loading '" DFILTER_MACRO_FILENAME "':\n%s",error);
-	}
 	
 }
 
Index: epan/crypt/airpdcap_interop.h
===================================================================
--- epan/crypt/airpdcap_interop.h	(revision 20660)
+++ epan/crypt/airpdcap_interop.h	(working copy)
@@ -86,8 +86,10 @@
 #endif
 
 #ifndef	size_t
+#ifndef	_SIZE_T
 typedef	gsize	size_t;
 #endif
+#endif
 
 #ifdef WIN32
 #include <winsock2.h>  /* ntohs() */