diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-29 06:42:23 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-29 06:42:23 +0000 |
| commit | cc948586bf33607f9dad86d66000d9834800cdd2 (patch) | |
| tree | ef5ad85f1bfcc0b3babd6b121734b490c86c45f6 /epan/dfilter/syntax-tree.h | |
| parent | cfcf299dfed664e8ebbde62f2ba09feaedb8825f (diff) | |
Use G_STRINGIFY/G_PASTE
svn path=/trunk/; revision=29614
Diffstat (limited to 'epan/dfilter/syntax-tree.h')
| -rw-r--r-- | epan/dfilter/syntax-tree.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h index 27f0aec58e..f8e1c6ff14 100644 --- a/epan/dfilter/syntax-tree.h +++ b/epan/dfilter/syntax-tree.h @@ -24,7 +24,6 @@ #define SYNTAX_TREE_H #include <glib.h> -#include "cppmagic.h" typedef enum { STTYPE_UNINITIALIZED, @@ -120,9 +119,9 @@ stnode_deprecated(stnode_t *node); #define STTYPE_ACCESSOR(ret,type,attr,magicnum) \ ret \ - CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node) \ + G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node) \ {\ - CONCAT(type,_t) *value; \ + G_PASTE(type,_t) *value; \ value = stnode_data(node);\ assert_magic(value, magicnum); \ return value->attr; \ @@ -130,7 +129,7 @@ stnode_deprecated(stnode_t *node); #define STTYPE_ACCESSOR_PROTOTYPE(ret,type,attr) \ ret \ - CONCAT(CONCAT(CONCAT(sttype_,type),_),attr) (stnode_t *node); + G_PASTE(G_PASTE(G_PASTE(sttype_,type),_),attr) (stnode_t *node); #endif |