From bef8e16fdfcc310d7208f55c6d11a12f4949d4b0 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 24 Nov 2001 17:07:08 +0000
Subject: [PATCH] Compile all programs with -DSTRICT -DNONAMELESSUNION
 -DNONAMELESSSTRUCT.

---
 programs/Makeprog.rules.in          | 2 +-
 programs/avitools/Makefile.in       | 2 +-
 programs/clock/Makefile.in          | 1 -
 programs/cmdlgtst/Makefile.in       | 1 -
 programs/control/Makefile.in        | 1 -
 programs/notepad/Makefile.in        | 1 -
 programs/osversioncheck/Makefile.in | 1 -
 programs/progman/Makefile.in        | 1 -
 programs/regapi/Makefile.in         | 1 -
 programs/regtest/Makefile.in        | 1 -
 programs/uninstaller/Makefile.in    | 1 -
 programs/view/Makefile.in           | 1 -
 programs/wcmd/Makefile.in           | 1 -
 programs/wineconsole/Makefile.in    | 2 +-
 programs/winemine/Makefile.in       | 1 -
 programs/winetest/Makefile.in       | 2 +-
 programs/winhelp/Makefile.in        | 1 -
 programs/winver/Makefile.in         | 1 -
 18 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index cee885d6c74..00a80cfc184 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -8,7 +8,7 @@
 # plus all variables required by the global Make.rules.in
 #
 
-DEFS       = @DLLFLAGS@ $(EXTRADEFS)
+DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
 LDDLLFLAGS = @LDDLLFLAGS@
 ALL_OBJS   = $(MODULE).spec.o $(OBJS)
 ALL_LIBS   = $(LIBWINE) $(EXTRALIBS) $(LIBS)
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index f52bb28b6f2..c96f24c9d5b 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -1,4 +1,4 @@
-DEFS       = @DLLFLAGS@
+DEFS       = @DLLFLAGS@ -DSTRICT -DNONAMELESSUNION -DNONAMELESSSTRUCT
 LDDLLFLAGS = @LDDLLFLAGS@
 TOPSRCDIR  = @top_srcdir@
 TOPOBJDIR  = ../..
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 6e2586a4f43..409c357fa71 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index 37d0cd2b0d8..4f362a8a1db 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 90f5343cb02..8158e7d0e7f 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 0630595dfa6..e757de17a8f 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in
index 7eff28508e6..e725115a5f1 100644
--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index e677f4e5e84..deb8c67ca50 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -1,4 +1,3 @@
-DEFS      = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index bb27ff92fbd..0eb1b24dadb 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index 90b3cd6d6e1..f296f5cea1e 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index ab4d545b657..7b6e08c7015 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index be222dd58b5..393f0f3c35d 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index a000e09f051..6f221e8c8c3 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index 672de8f1590..51492149778 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DSTRICT -DUNICODE
+EXTRADEFS = -DUNICODE
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index b177ea743cb..1eee283973c 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 37f3b936570..bca3806d053 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DSTRICT `perl -MExtUtils::Embed -e ccflags`
+EXTRADEFS = `perl -MExtUtils::Embed -e ccflags`
 EXTRALIBS = `perl -MExtUtils::Embed -e ldopts`
 EXTRAINCL = `perl -MExtUtils::Embed -e perl_inc`
 XSUBPPDIR = `perl -MConfig -e 'print $$Config::Config{privlibexp}'`/ExtUtils
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index c0513242505..f0dd8629c31 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINELIB -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index e1ec4e03179..bbedff70803 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
-- 
GitLab