Skip to content
Permalink
Browse files

OverlayConfig: avoid implementing OverlayConfigDialogNew on OS X Univ…

…ersal.

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.
  • Loading branch information...
mkrautz committed Nov 15, 2015
1 parent 9dba18f commit f5d72ba33680c7c2ca3233bd5e0fc373d8b5a5bb
Showing with 2 additions and 2 deletions.
  1. +2 −2 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

0 comments on commit f5d72ba

Please sign in to comment.
You can’t perform that action at this time.