osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Stop defining HAVE_CONFIG_H on Windows builds too. 

svn path=/trunk/; revision=45231
This commit is contained in:
Jeff Morriss 2012-10-01 11:47:36 +00:00
parent f89635883f
commit 2fbf659e28
9 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all.vcproj
View File

@ -28,7 +28,7 @@
ReBuildCommandLine="nmake -f Makefile.nmake setup distclean all"
CleanCommandLine="nmake -f Makefile.nmake clean_setup distclean"
Output="wireshark-gtk2\wireshark.exe"
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""

2
config.nmake
View File

@ -840,7 +840,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
!ENDIF
#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
STANDARD_CFLAGS=-DHAVE_CONFIG_H /DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
STANDARD_CFLAGS=/DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
# Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake
!IFDEF WIRESHARK_GENERATE_BSC_FILE

2
dumpcap.vcproj
View File

@ -27,7 +27,7 @@
ReBuildCommandLine=""
CleanCommandLine=""
Output="wireshark-gtk2\dumpcap.exe"
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""

2
packaging/u3/tools/Makefile.nmake
View File

@ -14,7 +14,7 @@ COPY = copy
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 /ENTRY:mainCRTStartup $(LOCAL_LDFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) -DHAVE_CONFIG_H $(LOCAL_CFLAGS) -I$(TOPDIR) $(GLIB_CFLAGS) $(GNUTLS_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(LOCAL_CFLAGS) -I$(TOPDIR) $(GLIB_CFLAGS) $(GNUTLS_CFLAGS)
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<

2
packaging/u3/tools/sysdep.h
View File

@ -41,9 +41,7 @@
** suitability of this software for any purpose.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef _WIN32
#include <sys/types.h>

2
tshark.vcproj
View File

@ -27,7 +27,7 @@
ReBuildCommandLine=""
CleanCommandLine=""
Output="wireshark-gtk2\tshark.exe"
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""

2
ui/gtk/libgtkui.vcproj
View File

@ -27,7 +27,7 @@
ReBuildCommandLine=""
CleanCommandLine=""
Output="libgtkui.exe"
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""

2
wireshark.vcproj
View File

@ -28,7 +28,7 @@
ReBuildCommandLine=""
CleanCommandLine="nmake -f Makefile.nmake distclean"
Output="wireshark-gtk2\wireshark.exe"
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""

2
wiretap/libwiretap.vcproj
View File

@ -27,7 +27,7 @@
ReBuildCommandLine=""
CleanCommandLine=""
Output="libwiretap.exe"
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;_DEBUG"
IncludeSearchPath=""
ForcedIncludes=""
AssemblySearchPath=""