diff options
author | Guy Harris <guy@alum.mit.edu> | 2011-04-20 18:04:43 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2011-04-20 18:04:43 +0000 |
commit | c93f8694e39feba1ca70311d1c6940962f4cf2f2 (patch) | |
tree | e30d886625393e027089f0a91d01c1f64fb4ed8e /wiretap/file_access.c | |
parent | 0aeaa1642684909c449548d251dd48353ecfa31d (diff) | |
download | wireshark-c93f8694e39feba1ca70311d1c6940962f4cf2f2.tar.gz |
Sigh. The "data" element of a GArray is, alas, a "gchar *", not a "void
*", and some compilers complain when you cast that pointer to something
requiring stricter alignment. Maybe the intent is to nudge you into
thinking about whether the pointer really is properly aligned, but....
svn path=/trunk/; revision=36739
Diffstat (limited to 'wiretap/file_access.c')
-rw-r--r-- | wiretap/file_access.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 8d1feff515..810a6ca5cc 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -179,7 +179,7 @@ static void init_open_routines(void) { g_array_append_vals(open_routines_arr,open_routines_base,N_FILE_TYPES); - open_routines = (wtap_open_routine_t*)open_routines_arr->data; + open_routines = (wtap_open_routine_t*)(void *)open_routines_arr->data; } void wtap_register_open_routine(wtap_open_routine_t open_routine, gboolean has_magic) { @@ -190,7 +190,7 @@ void wtap_register_open_routine(wtap_open_routine_t open_routine, gboolean has_m else g_array_append_val(open_routines_arr,open_routine); - open_routines = (wtap_open_routine_t*)open_routines_arr->data; + open_routines = (wtap_open_routine_t*)(void *)open_routines_arr->data; } /* @@ -662,7 +662,7 @@ static void init_file_types(void) { g_array_append_vals(dump_open_table_arr,dump_open_table_base,wtap_num_file_types); - dump_open_table = (const struct file_type_info*)dump_open_table_arr->data; + dump_open_table = (const struct file_type_info*)(void *)dump_open_table_arr->data; } int wtap_register_file_type(const struct file_type_info* fi) { @@ -670,7 +670,7 @@ int wtap_register_file_type(const struct file_type_info* fi) { g_array_append_val(dump_open_table_arr,*fi); - dump_open_table = (const struct file_type_info*)dump_open_table_arr->data; + dump_open_table = (const struct file_type_info*)(void *)dump_open_table_arr->data; return wtap_num_file_types++; } |