diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-02 22:54:39 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-02 22:54:39 +0000 |
| commit | 0a17799d614a4d0720d98e2ccea3e78502855f82 (patch) | |
| tree | 5acbe7b75c477e14b7a7231298247354b4c88688 /epan/address.h | |
| parent | 1eb5e1d73970baa2bf0dd603e5da02c9b6a2e617 (diff) | |
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from most of the dcerpc code
svn path=/trunk/; revision=48023
Diffstat (limited to 'epan/address.h')
| -rw-r--r-- | epan/address.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/address.h b/epan/address.h index 65bde09668..9a23846774 100644 --- a/epan/address.h +++ b/epan/address.h @@ -151,7 +151,7 @@ typedef struct _address { (to)->type = (from)->type; \ (to)->len = (from)->len; \ (to)->hf = (from)->hf; \ - COPY_ADDRESS_data = g_malloc((from)->len); \ + COPY_ADDRESS_data = (guint8 *)g_malloc((from)->len); \ memcpy(COPY_ADDRESS_data, (from)->data, (from)->len); \ (to)->data = COPY_ADDRESS_data; \ } @@ -181,7 +181,7 @@ typedef struct _address { #define ADD_ADDRESS_TO_HASH(hash_val, addr) { \ const guint8 *ADD_ADDRESS_TO_HASH_data; \ int ADD_ADDRESS_TO_HASH_index; \ - ADD_ADDRESS_TO_HASH_data = (addr)->data; \ + ADD_ADDRESS_TO_HASH_data = (const guint8 *)(addr)->data; \ for (ADD_ADDRESS_TO_HASH_index = 0; \ ADD_ADDRESS_TO_HASH_index < (addr)->len; \ ADD_ADDRESS_TO_HASH_index++) \ |