diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-02-06 02:27:59 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-02-06 02:27:59 +0000 |
| commit | 0c17bfd3a82489192d2738713c55366ccb277129 (patch) | |
| tree | 1f5de5bb09674274ad001c771fc3ec8178a7cf6f /gtk | |
| parent | 41c66690fcde064a76e310d579dd05d22704b805 (diff) | |
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.
svn path=/trunk/; revision=20726
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/about_dlg.c | 2 | ||||
| -rw-r--r-- | gtk/main.c | 4 |
2 files changed, 3 insertions, 3 deletions
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 |