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 /epan/tvbuff.c | |
parent | 6ae3372687957dfbda6352598aee00e84f83f7da (diff) |
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 'epan/tvbuff.c')
-rw-r--r-- | epan/tvbuff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 3a54ae68b5..ccda1a4832 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -43,7 +43,7 @@ #include <zlib.h> #endif -#include "pint.h" +#include "wsutil/pint.h" #include "tvbuff.h" #include "tvbuff-int.h" #include "strutil.h" @@ -86,7 +86,7 @@ static void tvb_free_internal(tvbuff_t *tvb) { gsize size; - + DISSECTOR_ASSERT(tvb); if (tvb->ops->tvb_free) @@ -288,7 +288,7 @@ check_offset_length(const tvbuff_t *tvb, guint *offset_ptr, guint *length_ptr) { int exception; - + exception = check_offset_length_no_exception(tvb, offset, length_val, offset_ptr, length_ptr); if (exception) THROW(exception); @@ -397,7 +397,7 @@ tvb_clone_offset_len(tvbuff_t *tvb, guint offset, guint len) { if (tvb->ops->tvb_clone) { tvbuff_t *cloned_tvb; - + cloned_tvb = tvb->ops->tvb_clone(tvb, offset, len); if (cloned_tvb) return cloned_tvb; |