diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-21 01:42:03 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-21 01:42:03 +0000 |
| commit | abc482e578333f820bba559ce183cb71879e8c72 (patch) | |
| tree | 11d08bc5430aee50bb94f35607d0f4d9e084f49c /config.nmake | |
| parent | 383467b2b3ab7f5779c399c1af49074b16722b45 (diff) | |
| download | wireshark-abc482e578333f820bba559ce183cb71879e8c72.tar.gz | |
Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
the compile line when building with cmake.
Put _U_'s definition in config.h when building with autofoo and on Windows.
svn path=/trunk/; revision=45034
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index 4c70b52ff3..ea1ab1d211 100644 --- a/config.nmake +++ b/config.nmake @@ -836,7 +836,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 -D_U_="" /DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS) +STANDARD_CFLAGS=-DHAVE_CONFIG_H /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 |