diff options
| -rw-r--r-- | dumpcap.c | 4 | ||||
| -rw-r--r-- | epan/crypt/airpdcap_interop.h | 2 | ||||
| -rw-r--r-- | gtk/about_dlg.c | 2 | ||||
| -rw-r--r-- | gtk/main.c | 4 | ||||
| -rw-r--r-- | tshark.c | 4 | ||||
| -rw-r--r-- | version_info.c | 4 | ||||
| -rw-r--r-- | version_info.h | 2 |
7 files changed, 12 insertions, 10 deletions
@@ -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 d6560c9e26..589703b75a 100644 --- 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 c9cdf738b1..18f8a7efdc 100644 --- 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 09d156db84..6fadee95a8 100644 --- 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 @@ -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 2cc11381bb..9fcad02bfb 100644 --- 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 6c3ef82d73..bd2464fbf9 100644 --- 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 |