diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 01:14:44 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-23 01:14:44 +0000 |
commit | 7cdf98c245f5e5d126ad614d64a1048356e9f1da (patch) | |
tree | 17a433c686d70f7e212b57f63de6823ca7d66ff5 /epan/proto.h | |
parent | f4f8bb343e78973c0be6aa2e35ea4bfb78bf325e (diff) |
Use gsize (size_t) in a couple of places to make the Win64 build happy.
svn path=/trunk/; revision=34191
Diffstat (limited to 'epan/proto.h')
-rw-r--r-- | epan/proto.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/proto.h b/epan/proto.h index 19aff82ff7..ef607079fb 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -321,7 +321,7 @@ typedef struct field_info { /** The protocol field value is in big endian */ #define FI_BIG_ENDIAN 0x00000010 /** Field value start from nth bit (values from 0x20 - 0x100) */ -#define FI_BITS_OFFSET(n) ((n & 7) << 5) +#define FI_BITS_OFFSET(n) ((n & 7) << 5) /** Field value takes n bits (values from 0x100 - 0x4000) */ /* if 0, it means that field takes fi->length * 8 */ #define FI_BITS_SIZE(n) ((n & 63) << 8) @@ -1828,9 +1828,9 @@ proto_check_field_name(const gchar *field_name); @param size the size of the string buffer */ const gchar * proto_custom_set(proto_tree* tree, const int field_id, - gint occurrence, - gchar *result, - gchar *expr, const int size ); + gint occurrence, + gchar *result, + gchar *expr, const gsize size ); #ifdef __cplusplus } |