diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
| commit | 2df54da6e2b70777154d38ce3923093568358285 (patch) | |
| tree | 4bdb887d40a0a5fee501c0bd30f31388019fbe32 /ui/gtk | |
| parent | 6ae3372687957dfbda6352598aee00e84f83f7da (diff) | |
| download | wireshark-2df54da6e2b70777154d38ce3923093568358285.tar.gz | |
Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.
Protect a bunch of the crypt header files from multiple inclusion.
svn path=/trunk/; revision=51100
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/hostlist_table.c | 2 | ||||
| -rw-r--r-- | ui/gtk/iax2_analysis.c | 2 | ||||
| -rw-r--r-- | ui/gtk/rtp_analysis.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 350eeb57ff..cdd939d1a4 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -41,7 +41,7 @@ #ifdef HAVE_GEOIP #include <GeoIP.h> #include <epan/geoip_db.h> -#include <epan/pint.h> +#include <wsutil/pint.h> #include <epan/filesystem.h> #endif diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 54aa27b4aa..2019fff30f 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -54,10 +54,10 @@ #include <wsutil/file_util.h> #include <wsutil/g711.h> #include <wsutil/tempfile.h> +#include <wsutil/pint.h> #include <epan/epan_dissect.h> #include <epan/filesystem.h> -#include <epan/pint.h> #include <epan/tap.h> #include <epan/tap-voip.h> #include <epan/dissectors/packet-iax2.h> diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index b6e01ba413..8f9295897d 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -53,10 +53,10 @@ #include <wsutil/file_util.h> #include <wsutil/tempfile.h> #include <wsutil/g711.h> +#include <wsutil/pint.h> #include <epan/epan_dissect.h> #include <epan/filesystem.h> -#include <epan/pint.h> #include <epan/tap.h> #include <epan/dissectors/packet-rtp.h> #include <epan/rtp_pt.h> |