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 /epan/crypt | |
| 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 'epan/crypt')
| -rw-r--r-- | epan/crypt/airpdcap_interop.h | 2 |
1 files changed, 2 insertions, 0 deletions
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() */ |