[Bf-blender-cvs] [ef40f91] decklink: Fix warnings when compiling WITH_DECKLINK=OFF and WITH_X11_ALPHA=OFF

[Benoit Bolsee]

Commit: ef40f9164ca943a89e9fa0e9e13c1faa2da65aa2
Author: Benoit Bolsee
Date:   Mon Nov 2 14:28:14 2015 +0100
Branches: decklink
https://developer.blender.org/rBef40f9164ca943a89e9fa0e9e13c1faa2da65aa2

Fix warnings when compiling WITH_DECKLINK=OFF and WITH_X11_ALPHA=OFF

===================================================================

M	intern/ghost/intern/GHOST_WindowX11.cpp
M	source/gameengine/VideoTexture/Exception.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index dd2bb18..560a071 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -168,13 +168,10 @@ static XVisualInfo *x11_visualinfo_from_glx(
         GLXFBConfig *fbconfig)
 {
 	XVisualInfo *visual = NULL;
-	GLXFBConfig *fbconfigs;
-	int nbfbconfig;
 	GHOST_TUns16 numOfAASamples = *r_numOfAASamples;
 	int glx_major, glx_minor, glx_version; /* GLX version: major.minor */
 	GHOST_TUns16 actualSamples;
 	int glx_attribs[64];
-	int i;
 
 	*fbconfig = NULL;
 
@@ -207,6 +204,9 @@ static XVisualInfo *x11_visualinfo_from_glx(
 	    && (glXGetVisualFromFBConfig ||
 	        (glXGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGPROC)glXGetProcAddressARB((const GLubyte *)"glXGetVisualFromFBConfig")) != NULL)
 	    ) {
+		GLXFBConfig *fbconfigs;
+		int nbfbconfig;
+		int i;
 
 		for (;;) {
 
diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp
index eccb7f7..322b7f9 100644
--- a/source/gameengine/VideoTexture/Exception.cpp
+++ b/source/gameengine/VideoTexture/Exception.cpp
@@ -225,9 +225,10 @@ void registerAllExceptions(void)
 	SourceVideoEmptyDesc.registerDesc();
 	SourceVideoCreationDesc.registerDesc();
 	OffScreenInvalidDesc.registerDesc();
+#ifdef WITH_DECKLINK
+	AutoDetectionNotAvailDesc.registerDesc();
 	DeckLinkBadDisplayModeDesc.registerDesc();
 	DeckLinkBadPixelFormatDesc.registerDesc();
-	AutoDetectionNotAvailDesc.registerDesc();
 	DeckLinkOpenCardDesc.registerDesc();
 	DeckLinkBadFormatDesc.registerDesc();
 	DeckLinkInternalErrorDesc.registerDesc();
@@ -236,4 +237,5 @@ void registerAllExceptions(void)
 	VideoDeckLinkOpenCardDesc.registerDesc();
 	VideoDeckLinkDvpInternalErrorDesc.registerDesc();
 	VideoDeckLinkPinMemoryErrorDesc.registerDesc();
+#endif
 }