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 /packaging/u3 | |
| parent | f89635883fe7d0967ef0fb14ab3396d2682db1c1 (diff) | |
| download | wireshark-2fbf659e28aae69ba2dd5482571d612a9cf7e039.tar.gz wireshark-2fbf659e28aae69ba2dd5482571d612a9cf7e039.tar.bz2 wireshark-2fbf659e28aae69ba2dd5482571d612a9cf7e039.zip | |
Stop defining HAVE_CONFIG_H on Windows builds too.
svn path=/trunk/; revision=45231
Diffstat (limited to 'packaging/u3')
| -rw-r--r-- | packaging/u3/tools/Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/u3/tools/sysdep.h | 2 |
2 files changed, 1 insertions, 3 deletions
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> |