diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 09:13:09 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 09:13:09 +0000 |
| commit | 1e762e315dcb07f8d78d7aabc20f5065a8ed43f0 (patch) | |
| tree | d4a7d50c932f911e72025008669b7247b6448869 /epan | |
| parent | f348cd5678bc5d161d6fa478d42d90902c97a319 (diff) | |
Remove epan.h from ftypes.h, address.h and tpg.h,
add it to proto.h as it contains macros that require emem.h
svn path=/trunk/; revision=52001
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/address.h | 1 | ||||
| -rw-r--r-- | epan/ftypes/ftypes.h | 1 | ||||
| -rw-r--r-- | epan/proto.h | 2 | ||||
| -rw-r--r-- | epan/tpg.h | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/epan/address.h b/epan/address.h index c11bedd4c6..f1848adfe1 100644 --- a/epan/address.h +++ b/epan/address.h @@ -27,7 +27,6 @@ #define __ADDRESS_H__ #include <string.h> /* for memcmp */ -#include "emem.h" #ifdef __cplusplus extern "C" { diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index 856c476e8e..11c850b6ce 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -27,7 +27,6 @@ #define __FTYPES_H__ #include <glib.h> -#include "../emem.h" #include "ws_symbol_export.h" #ifdef __cplusplus diff --git a/epan/proto.h b/epan/proto.h index cdb9c9c012..1fbee97be5 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -45,6 +45,8 @@ #include <glib.h> +#include <epan/emem.h> + #include "ipv4.h" #include "wsutil/nstime.h" #include "time_fmt.h" diff --git a/epan/tpg.h b/epan/tpg.h index 4bd5efc64e..0da6ca7108 100644 --- a/epan/tpg.h +++ b/epan/tpg.h @@ -32,7 +32,6 @@ #include <epan/proto.h> #include <epan/tvbuff.h> #include <epan/tvbparse.h> -#include <epan/emem.h> #include "ws_symbol_export.h" typedef struct _tpg_parser_data_t { |