From 5378455e7af22259983c0cbb3444e7baa180435b Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 4 Mar 2013 22:49:23 +0000
Subject: [PATCH] Don't define WS_BUILD_DLL when building capinfos and editcap.
 In the case of capinfos this breaks getopt because optind isn't properly
 imported.

svn path=/trunk/; revision=48072
---
 Makefile.nmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.nmake b/Makefile.nmake
index b1c54fbd46..a6831a9374 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -327,7 +327,7 @@ rawshark.exe	: $(LIBS_CHECK) config.h $(rawshark_OBJECTS) epan ui image\rawshark
 #      (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all').
 # Linking with setargv.obj enables "wildcard expansion" of command-line arguments
 capinfos.obj	:
-	$(CC) $(CFLAGS) -DWS_BUILD_DLL -Fd.\ -c capinfos.c
+	$(CC) $(CFLAGS) -Fd.\ -c capinfos.c
 capinfos.exe	: $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
 	@echo Linking $@
 	$(LINK) @<<
@@ -340,7 +340,7 @@ capinfos.exe	: $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib w
 # XXX: This makefile does not properly handle doing a 'nmake ... editcap.exe' directly since some of the .objs
 #      (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all').
 editcap.obj	:
-	$(CC) $(CFLAGS) -DWS_BUILD_DLL -Fd.\ -c editcap.c
+	$(CC) $(CFLAGS) -Fd.\ -c editcap.c
 editcap.exe	: $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
 	@echo Linking $@
 	$(LINK) @<<