diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-02-27 20:34:09 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-02-27 20:34:09 +0000 |
commit | b864c8d80daa2ac2c3d8dd867c72f1d9341497f1 (patch) | |
tree | 338b7d2c8a6c1a1bda192d31a9cf47db27d0362e /epan/dfilter | |
parent | ed665a1b50f8355961b7b1dd8884c1624624a46b (diff) |
Move the location of cppmagic.h, since the lemon-flex include files
require it. It makes more sense to either put cppmagic with lemon, or
in yet another common directory. I'll just put it with lemon.
svn path=/trunk/; revision=3083
Diffstat (limited to 'epan/dfilter')
-rw-r--r-- | epan/dfilter/Makefile.am | 3 | ||||
-rw-r--r-- | epan/dfilter/cppmagic.h | 14 |
2 files changed, 1 insertions, 16 deletions
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 9f34939e1c..09755684dc 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am,v 1.7 2001/02/27 19:23:28 gram Exp $ +# $Id: Makefile.am,v 1.8 2001/02/27 20:34:08 gram Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -34,7 +34,6 @@ CLEANFILES = \ INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/$(LEMON) libdfilter_a_SOURCES = \ - cppmagic.h \ dfilter.c \ dfilter.h \ dfilter-int.h \ diff --git a/epan/dfilter/cppmagic.h b/epan/dfilter/cppmagic.h deleted file mode 100644 index 92bef11eb1..0000000000 --- a/epan/dfilter/cppmagic.h +++ /dev/null @@ -1,14 +0,0 @@ -/* $Id: cppmagic.h,v 1.1 2001/02/01 20:21:18 gram Exp $ */ - -/**************************************** CPP definitions ***************/ - -/* CPP magic: Concatenate two strings or macros that resolve to strings. - * Use CONCAT(), not _CONCAT() */ -#define _CONCAT(a,b) a ## b -#define CONCAT(a,b) _CONCAT(a,b) - -/* CPP magic: Surround a string or a macro that resolves to a string with - * double quotes. */ -#define _STRINGIFY(a) # a -#define STRINGIFY(a) _STRINGIFY(a) - |