wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1222323 - Avoid passing extra defines to the compiler from config.mk. r=gps

Browse Source 
C/C++ code should not be relying on XPI_NAME or AB_CD being defined, so
moving them out works.
This commit is contained in:
Mike Hommey 2015-10-30 11:31:14 +09:00
parent b6c017a6ba
commit 16f30343c3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/config.mk
View File

@ -101,7 +101,7 @@ FINAL_TARGET ?= $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin)$(DIS
FINAL_TARGET_FROZEN := '$(FINAL_TARGET)'
ifdef XPI_NAME
DEFINES += -DXPI_NAME=$(XPI_NAME)
ACDEFINES += -DXPI_NAME=$(XPI_NAME)
endif
# The VERSION_NUMBER is suffixed onto the end of the DLLs we ship.
@ -533,7 +533,7 @@ sysinstall_cmd = install_cmd
# overridden by the command line. (Besides, AB_CD is prettier).
AB_CD = $(MOZ_UI_LOCALE)
# Many locales directories want this definition.
DEFINES += -DAB_CD=$(AB_CD)
ACDEFINES += -DAB_CD=$(AB_CD)
ifndef L10NBASEDIR
L10NBASEDIR = $(error L10NBASEDIR not defined by configure)
@ -689,5 +689,3 @@ export CL_INCLUDES_PREFIX
# in environment variables to prevent it from breking silently on
# non-English systems.
export NONASCII
DEFINES += -DNO_NSPR_10_SUPPORT

3
configure.in
View File

@ -9172,6 +9172,9 @@ if test -z "$JS_SHARED_LIBRARY"; then
fi
AC_SUBST(JS_SHARED_LIBRARY)
# Avoid using obsolete NSPR features
AC_DEFINE(NO_NSPR_10_SUPPORT)
MOZ_CREATE_CONFIG_STATUS()
if test "$COMPILE_ENVIRONMENT"; then