From Eric Hall to fix bug 1289:

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1289

Rename 'svnversion' to 'wireshark_svnversion' to resolve a symbol conflict with
GTK 2.10.6 (hmm, shouldn't GTK not be exporting that symbol or at least naming
it so as to prevent such collisions? Well, so should we, so...)

From Andreas Fink: change #ifdef for size_t in airdcap_interop.h to fix
compile on MacOS X.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20726 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/dumpcap.c b/dumpcap.c
index 1909a97891ce2d4de59b17834c82233a4de2b26c..07641ae83985f73a6ba2a4c2e940b4aa15310e81 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -98,7 +98,7 @@ print_usage(gboolean print_ver) {
         "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 @@ show_version(GString *comp_info_str, GString *runtime_info_str)
         "%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);
 }
 
 /*

diff --git a/epan/crypt/airpdcap_interop.h b/epan/crypt/airpdcap_interop.h
index d6560c9e26cd02ff8952ac7a43f5a55cbad793dd..589703b75a4be1c326869ce45627b7f500233272 100644 (file)
--- a/epan/crypt/airpdcap_interop.h
+++ b/epan/crypt/airpdcap_interop.h
@@ -86,8 +86,10 @@ typedef guchar       UCHAR;
 #endif
 
 #ifndef        size_t
+#ifndef        _SIZE_T
 typedef        gsize   size_t;
 #endif
+#endif
 
 #ifdef WIN32
 #include <winsock2.h>  /* ntohs() */

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index c9cdf738b1cdc55ed844a2cba527aec4a4f3914f..18f8a7efdcc032745e9faa90088a209586e5a10a 100644 (file)
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -163,7 +163,7 @@ about_wireshark_page_new(void)
        "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);

diff --git a/gtk/main.c b/gtk/main.c
index 09d156db841e89e80ea8263c568d2278f2d4be31..6fadee95a8396f98ca58275d8ae8957679a9fadd 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1199,7 +1199,7 @@ print_usage(gboolean print_ver) {
         "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 @@ show_version(void)
          "%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

diff --git a/tshark.c b/tshark.c
index 4489f60f7710f3edc2eea8944ec2cecf45047bdc..8ce46677fb194d0dbb9407b97881193dae3a9afd 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -221,7 +221,7 @@ print_usage(gboolean print_ver)
         "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 @@ main(int argc, char *argv[])
                "%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;

diff --git a/version_info.c b/version_info.c
index 2cc11381bb2ee315c135eb0bec9f0aabf89cfbaa..9fcad02bfb71854d9902cbc91564fe18d35b0175 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -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
 
 /*

diff --git a/version_info.h b/version_info.h
index 6c3ef82d73f02eef3bea76dbb0dc4b90c611e7a2..bd2464fbf906b33128867f79f3d2461aa733aeed 100644 (file)
--- a/version_info.h
+++ b/version_info.h
@@ -33,7 +33,7 @@ extern "C" {
 /*
  * The svn version string or ""
  */
-extern const gchar *svnversion;
+extern const gchar *wireshark_svnversion;
 
 /*
  * Get various library compile-time versions and append them to