aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-03-02 22:19:33 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-03-02 22:19:33 +0000
commitfc9156a8a0951e645cca59a2173a8101eca0dba8 (patch)
tree2b31e3214594efafc898e98c965b00a7b8a45c98 /wiretap
parent73aafe2bc4db3f0d0d98107d2b2e861f1dcbc543 (diff)
Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/Makefile.nmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index d2a6c6c861..e09edd061c 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -13,9 +13,10 @@ GENERATED_CFLAGS=\
$(STANDARD_CFLAGS) \
-DYYMALLOC=malloc -DYYFREE=free \
/I. /I.. $(GLIB_CFLAGS) \
- $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include
+ $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \
+ -DWS_BUILD_DLL
-CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) -DWS_BUILD_DLL
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<