diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-02-06 02:27:59 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-02-06 02:27:59 +0000 |
| commit | 4e6a87252295b2393ca126b7754288c4d2ef5cbf (patch) | |
| tree | 1f5de5bb09674274ad001c771fc3ec8178a7cf6f /dumpcap.c | |
| parent | e36d5eef7d0dedecd10e35e110e4c03c9e300f28 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20726 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'dumpcap.c')
| -rw-r--r-- | dumpcap.c | 4 |
1 files changed, 2 insertions, 2 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); } /* |