diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-14 10:23:59 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-14 10:23:59 +0000 |
| commit | f99694bb11d8dbdeb45aa5b93059c633078ae60a (patch) | |
| tree | e10fc01c19deee2aff4fb8e045dc93ee687b6368 /epan/reassemble_test.c | |
| parent | 0ca2dd85aec3f8cb84901850d969ea64fe19ca55 (diff) | |
Squelch a "not permitted in C++" warning.
svn path=/trunk/; revision=50574
Diffstat (limited to 'epan/reassemble_test.c')
| -rw-r--r-- | epan/reassemble_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index fa5075a751..09c9d0f00c 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -1558,7 +1558,7 @@ main(int argc _U_, char **argv _U_) emem_init(); /* a tvbuff for testing with */ - data = g_malloc(DATA_LEN); + data = (char *)g_malloc(DATA_LEN); /* make sure it's full of stuff */ for(i=0; i<DATA_LEN; i++) { data[i]=i & 0xFF; |