Define LIBO_WERROR when warnings are errors

13 files changed, 22 insertions, 22 deletions

diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index e9653eda5d1f..97cbafb39b81 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -97,8 +97,8 @@ gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
 gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 01ff9d0613a2..f076256d2ff5 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -116,8 +116,8 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
 gb_OBJCFLAGS := -x objective-c
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 ifeq ($(ENABLE_LTO),TRUE)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f1c19897b978..5d0ffbeba590 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,8 +120,8 @@ gb_CXXFLAGS += -fno-strict-aliasing
 endif
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 ifeq ($(HAVE_CXX0X),TRUE)
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 901b57af7a19..8315f142e9cf 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -181,8 +181,8 @@ gb_STDLIBS := \
 	advapi32 \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -WX
-gb_CXXFLAGS_WERROR := -WX
+gb_CFLAGS_WERROR := -WX -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index bf8112070cf3..4f0a188ce2d7 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -91,8 +91,8 @@ gb_CXXFLAGS := \
 	-pipe \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
 ifneq ($(SYSBASE),)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a7eeaa4d91cf..028e954c127a 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -138,7 +138,7 @@ CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor -Woverloaded-virtual
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
 COMPILER_WARN_ERRORS=TRUE
 
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 773457a0d786..06f11687f6b0 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -95,7 +95,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
 LINK*=$(CXX)
 LINKC*=$(CC)
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index b5351cbb567d..17575ad741f5 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -149,7 +149,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index 8fce32c2e039..c21c36237e87 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -100,8 +100,8 @@ CFLAGSWARNCC=
 CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
+CFLAGSWERRCC=-errwarn=%all -DLIBO_WERROR
+CFLAGSWERRCXX=-xwe -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 02c01f40cc4e..b609951f6800 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -106,8 +106,8 @@ CFLAGSWARNCC=
 CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
+CFLAGSWERRCC=-errwarn=%all -DLIBO_WERROR
+CFLAGSWERRCXX=-xwe -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 91a6c8968fda..ab276cb0504f 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -105,8 +105,8 @@ CFLAGSWARNCC=
 CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,hidef,anonnotype,unassigned,badargtype2w
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
+CFLAGSWERRCC=-errwarn=%all -DLIBO_WERROR
+CFLAGSWERRCXX=-xwe -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 85b6a91b9a5c..f62c96aaabec 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -84,8 +84,8 @@ CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-CFLAGSWERRCXX=-Werror
+CFLAGSWERRCC=-Werror -DLIBO_WERROR
+CFLAGSWERRCXX=-Werror -DLIBO_WERROR
 
 MODULES_WITH_WARNINGS := \
     b_server \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index bf94a0f04fa9..efb53298de13 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -201,7 +201,7 @@ CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -wd4275 \
 CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-WX
+CFLAGSWERRCC=-WX -DLIBO_WERROR
 
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see