aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-06-20 18:30:54 +0000
committerGerald Combs <gerald@wireshark.org>2006-06-20 18:30:54 +0000
commitf7e38bd5e65ca78ca1ff385a403b2eb01255c697 (patch)
treed60c188ff951ee2301f647bee53310e2c80af4c3 /debian/patches
parent797bb2d5d7cfcaf497585bd68afe1d37d96b9852 (diff)
Change ETH_VAR_IMPORT to WS_VAR_IMPORT. Try to fix a duplicate variable
definition in the Catapult DCT2000 code. svn path=/trunk/; revision=18524
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01_idl2deb.dpatch2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/patches/01_idl2deb.dpatch b/debian/patches/01_idl2deb.dpatch
index 8115ae0f94..2d32535b65 100644
--- a/debian/patches/01_idl2deb.dpatch
+++ b/debian/patches/01_idl2deb.dpatch
@@ -85,7 +85,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./idl2deb /tmp/dpep-work.K2bQz4/etherea
+BUILT_SOURCES = packet-%s.c
+INCLUDES = -DHAVE_CONFIG -DHAVE_SYS_TYPES_H -DHAVE_SYS_TIME_H \\
+ -DHAVE_STDARG_H -D_U_=\"__attribute__((unused))\" \\
-+ -I/usr/include/ethereal -DETH_VAR_IMPORT=extern $(GLIB_CFLAGS)
++ -I/usr/include/ethereal -DWS_VAR_IMPORT=extern $(GLIB_CFLAGS)
+LDADD = $(GLIB_LIBS)
+
+# Libs must be cleared, or else libtool won't create a shared module.