diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-10-24 05:21:43 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-10-24 05:21:43 +0000 |
| commit | c1e2438551e6aafaf0da386f8ff4135e8d20f16f (patch) | |
| tree | 052871e9ecda75b006c337bbb4420dbb96cce49d /epan/wmem | |
| parent | 3ceef88b49a2d12172c9714c8adab06acf00cacc (diff) | |
Have wmem_core.h define the wmem_allocator_t typedef, with an incomplete
structure definition of struct _wmem_allocator_t; have wmem_allocator.h
give the complete structure definition. That avoids complaints about
the typedef being redefined.
svn path=/trunk/; revision=45750
Diffstat (limited to 'epan/wmem')
| -rw-r--r-- | epan/wmem/wmem_allocator.h | 2 | ||||
| -rw-r--r-- | epan/wmem/wmem_core.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/epan/wmem/wmem_allocator.h b/epan/wmem/wmem_allocator.h index 6c9c931e34..01f308f7b5 100644 --- a/epan/wmem/wmem_allocator.h +++ b/epan/wmem/wmem_allocator.h @@ -32,7 +32,7 @@ extern "C" { #endif /* __cplusplus */ -typedef struct _wmem_allocator_t { +struct _wmem_allocator_t { void *(*alloc)(void *private_data, size_t size); void (*free_all)(void *private_data); diff --git a/epan/wmem/wmem_core.h b/epan/wmem/wmem_core.h index ec44bf78bd..8b118ac7fd 100644 --- a/epan/wmem/wmem_core.h +++ b/epan/wmem/wmem_core.h @@ -32,6 +32,8 @@ extern "C" { #endif /* __cplusplus */ +struct _wmem_allocator_t; + typedef struct _wmem_allocator_t wmem_allocator_t; void * |