diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-10-01 11:47:36 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-10-01 11:47:36 +0000 |
| commit | 2fbf659e28aae69ba2dd5482571d612a9cf7e039 (patch) | |
| tree | aa67839a7207dbad466bfd48e03051e1cb8f6159 | |
| parent | f89635883fe7d0967ef0fb14ab3396d2682db1c1 (diff) | |
Stop defining HAVE_CONFIG_H on Windows builds too.
svn path=/trunk/; revision=45231
| -rw-r--r-- | all.vcproj | 2 | ||||
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | dumpcap.vcproj | 2 | ||||
| -rw-r--r-- | packaging/u3/tools/Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/u3/tools/sysdep.h | 2 | ||||
| -rw-r--r-- | tshark.vcproj | 2 | ||||
| -rw-r--r-- | ui/gtk/libgtkui.vcproj | 2 | ||||
| -rw-r--r-- | wireshark.vcproj | 2 | ||||
| -rw-r--r-- | wiretap/libwiretap.vcproj | 2 |
9 files changed, 8 insertions, 10 deletions
diff --git a/all.vcproj b/all.vcproj index 58f750194d..122035b8fb 100644 --- a/all.vcproj +++ b/all.vcproj @@ -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="" diff --git a/config.nmake b/config.nmake index a3b6f1210a..aab569059b 100644 --- a/config.nmake +++ b/config.nmake @@ -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 diff --git a/dumpcap.vcproj b/dumpcap.vcproj index f7109ea94c..57dadb63fa 100644 --- a/dumpcap.vcproj +++ b/dumpcap.vcproj @@ -27,7 +27,7 @@ ReBuildCommandLine="" CleanCommandLine="" Output="wireshark-gtk2\dumpcap.exe" - PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H" + PreprocessorDefinitions="WIN32;_DEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" diff --git a/packaging/u3/tools/Makefile.nmake b/packaging/u3/tools/Makefile.nmake index a74dde4e63..a3b0cc270c 100644 --- a/packaging/u3/tools/Makefile.nmake +++ b/packaging/u3/tools/Makefile.nmake @@ -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 $< diff --git a/packaging/u3/tools/sysdep.h b/packaging/u3/tools/sysdep.h index cfd899b8d1..a86d201e49 100644 --- a/packaging/u3/tools/sysdep.h +++ b/packaging/u3/tools/sysdep.h @@ -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> diff --git a/tshark.vcproj b/tshark.vcproj index e03ac18f86..2c77751161 100644 --- a/tshark.vcproj +++ b/tshark.vcproj @@ -27,7 +27,7 @@ ReBuildCommandLine="" CleanCommandLine="" Output="wireshark-gtk2\tshark.exe" - PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H" + PreprocessorDefinitions="WIN32;_DEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" diff --git a/ui/gtk/libgtkui.vcproj b/ui/gtk/libgtkui.vcproj index 1aed61080c..61126533e6 100644 --- a/ui/gtk/libgtkui.vcproj +++ b/ui/gtk/libgtkui.vcproj @@ -27,7 +27,7 @@ ReBuildCommandLine="" CleanCommandLine="" Output="libgtkui.exe" - PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H" + PreprocessorDefinitions="WIN32;_DEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" diff --git a/wireshark.vcproj b/wireshark.vcproj index 8d247af052..bc8f70626a 100644 --- a/wireshark.vcproj +++ b/wireshark.vcproj @@ -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="" diff --git a/wiretap/libwiretap.vcproj b/wiretap/libwiretap.vcproj index 787445a76c..5149f6fb6a 100644 --- a/wiretap/libwiretap.vcproj +++ b/wiretap/libwiretap.vcproj @@ -27,7 +27,7 @@ ReBuildCommandLine="" CleanCommandLine="" Output="libwiretap.exe" - PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H" + PreprocessorDefinitions="WIN32;_DEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" |