diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
| commit | c8d69ebaeed8005d38c91613ab699747f45b2228 (patch) | |
| tree | cd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/config/cf | |
| parent | 105cd2be6dfce3579cb585a8d78f655f19cef57b (diff) | |
| parent | 4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff) | |
| download | nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2 nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip | |
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/host.def | 2 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 4 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorgsite.def | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 2df1cd672..f9a990ede 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -230,7 +230,7 @@ * #define GccWarningOptions -Wall -Wpedantic -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs + -Wredundant-decls -Wnested-externs -Wshadow */ /* diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 0444d18cc..8d39c338a 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -720,9 +720,9 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # if XFree86Devel # define GccWarningOptions -Wall -Wpedantic -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs Gcc28Warnings + -Wredundant-decls -Wnested-externs -Wshadow Gcc28Warnings # else -# define GccWarningOptions -Wall -Wpedantic -Wpointer-arith Gcc28Warnings +# define GccWarningOptions -Wall -Wpedantic -Wpointer-arith -Wshadow Gcc28Warnings # endif # endif # ifndef DefaultCCOptions diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index 0ffe86056..5c5cf4431 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -113,7 +113,7 @@ * #define GccWarningOptions -Wall -Wpedantic -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs + -Wredundant-decls -Wnested-externs -Wshadow */ /* |