diff options
author | Guy Harris <guy@alum.mit.edu> | 2007-04-30 19:24:25 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2007-04-30 19:24:25 +0000 |
commit | 1d73cea47065011c327f83b9c26ab973504a8117 (patch) | |
tree | 5dd407225e18178c9fdc4c126cccdf7d4dfd08b0 /epan/garrayfix.h | |
parent | db53f99ccabc039963b3540b10eeef7ff41e2ea4 (diff) |
Add a header that redefines g_array_index() to throw in a "void *" cast
to work around the "data" field of a GArray being a guint8 *, and
defines a g_array_data() macro to extract that field and cast it to void
*.
Use that header where needed.
svn path=/trunk/; revision=21627
Diffstat (limited to 'epan/garrayfix.h')
-rw-r--r-- | epan/garrayfix.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/epan/garrayfix.h b/epan/garrayfix.h new file mode 100644 index 0000000000..06d88073e5 --- /dev/null +++ b/epan/garrayfix.h @@ -0,0 +1,38 @@ +/* garrayfix.h + * Macros to work around the "data" field of a GArray having type guint8 *, + * rather than void *, so that, even though the GArray code should be + * ensuring that the data is aligned strictly enough for any data type, + * we still get warnings with -Wcast-align. + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __GARRAYFIX_H__ +#define __GARRAYFIX_H__ + +#ifdef g_array_index +#undef g_array_index +#define g_array_index(a,t,i) (((t*) (void*) (a)->data) [(i)]) +#endif + +#define g_array_data(a) ((void*) (a)->data) + +#endif /* __GARRAYFIX_H__ */ |