diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-29 07:53:48 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-29 07:53:48 +0000 |
| commit | cd490634730695bb3e87c20e0c1b815909be27f2 (patch) | |
| tree | 6230113ec6e11ee94c036cab8da3b813d853e4ff /epan/dfilter | |
| parent | cc948586bf33607f9dad86d66000d9834800cdd2 (diff) | |
| download | wireshark-cd490634730695bb3e87c20e0c1b815909be27f2.tar.gz | |
Revert r29614 until I figure out why buildbot doesn't like it
svn path=/trunk/; revision=29615
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/syntax-tree.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h index f8e1c6ff14..27f0aec58e 100644 --- a/epan/dfilter/syntax-tree.h +++ b/epan/dfilter/syntax-tree.h @@ -24,6 +24,7 @@ #define SYNTAX_TREE_H #include <glib.h> +#include "cppmagic.h" typedef enum { STTYPE_UNINITIALIZED, @@ -119,9 +120,9 @@ stnode_deprecated(stnode_t *node); #define STTYPE_ACCESSOR(ret,type,attr,magicnum) \ ret \ - G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node) \ + CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node) \ {\ - G_PASTE(type,_t) *value; \ + CONCAT(type,_t) *value; \ value = stnode_data(node);\ assert_magic(value, magicnum); \ return value->attr; \ @@ -129,7 +130,7 @@ stnode_deprecated(stnode_t *node); #define STTYPE_ACCESSOR_PROTOTYPE(ret,type,attr) \ ret \ - G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node); + CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node); #endif |