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 /version_info.c | |
| parent | 41c66690fcde064a76e310d579dd05d22704b805 (diff) | |
| download | wireshark-0c17bfd3a82489192d2738713c55366ccb277129.tar.gz wireshark-0c17bfd3a82489192d2738713c55366ccb277129.tar.bz2 wireshark-0c17bfd3a82489192d2738713c55366ccb277129.zip | |
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 'version_info.c')
| -rw-r--r-- | version_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 /* |