diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-11-15 23:07:51 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-11-15 23:07:56 +0300 |
| commit | f5d72ba33680c7c2ca3233bd5e0fc373d8b5a5bb (patch) | |
| tree | d91e2dc122532ba02818e91223c5b2192fb281cf /src/mumble/OverlayConfig.cpp | |
| parent | 9dba18fcca6928afe822e53cf718c21371877338 (diff) | |
OverlayConfig: avoid implementing OverlayConfigDialogNew on OS X Universal.
The OverlayConfigDialogNew function is only used by the ConfigRegistrar
just below its declaration.
That ConfigRegistrar is only created on system that aren't OS X Universal.
Now that we build with -Werror, the fact that OverlayConfigDialogNew is
unused on OS X Universal is causing trouble.
To fix the warning about OverlayConfigDialogNew being unused on OS X
Universal, we simply move it into the if !defined(USE_MAC_UNIVERSAL)
block, since it is not used anywhere else.
Diffstat (limited to 'src/mumble/OverlayConfig.cpp')
| -rw-r--r-- | src/mumble/OverlayConfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp index e994b9650..acc2be694 100644 --- a/src/mumble/OverlayConfig.cpp +++ b/src/mumble/OverlayConfig.cpp @@ -50,12 +50,12 @@ #include "../../overlay/overlay_blacklist.h" #endif +// Hide overlay config for Mac OS X universal builds +#if !defined(USE_MAC_UNIVERSAL) static ConfigWidget *OverlayConfigDialogNew(Settings &st) { return new OverlayConfig(st); } -// Hide overlay config for Mac OS X universal builds -#if !defined(USE_MAC_UNIVERSAL) static ConfigRegistrar registrar(6000, OverlayConfigDialogNew); #endif |