am 17536801: am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""

* commit '17536801ea179360da3ba2886dfc48dda392d28a':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
This commit is contained in:
Ian Rogers 2014-03-10 23:42:20 +00:00 committed by Android Git Automerger
commit 17fe9e3000
3 changed files with 3 additions and 3 deletions

View File

@ -36,7 +36,7 @@ endif # BUILD_HOST_static
# Workaround differences in inttypes.h between host and target.
# See bug 12708004.
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS
build_mac_version := $(shell sw_vers -productVersion)

View File

@ -60,6 +60,6 @@ HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
# Workaround differences in inttypes.h between host and target.
# See bug 12708004.
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS
HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined

View File

@ -42,7 +42,7 @@ endif # Linux
# Workaround differences in inttypes.h between host and target.
# See bug 12708004.
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS
HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX)
HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX)