[xserver] hw/dmx: fix build without GLX

Message ID 1354749687-25495-1-git-send-email-robdclark@gmail.com
State New
Headers show

Commit Message

Rob Clark Dec. 5, 2012, 11:21 p.m.
Fixes this compile break that showed up on arm recently:

dmxinit.c:746:26: error: 'glxSupported' undeclared (first use in this function)
dmxinit.c:746:26: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Rob Clark <robdclark@gmail.com>
---
 hw/dmx/dmxinit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alex Deucher Dec. 6, 2012, 2:09 p.m. | #1
On Wed, Dec 5, 2012 at 6:21 PM, Rob Clark <robdclark@gmail.com> wrote:
> Fixes this compile break that showed up on arm recently:
>
> dmxinit.c:746:26: error: 'glxSupported' undeclared (first use in this function)
> dmxinit.c:746:26: note: each undeclared identifier is reported only once for each function it appears in
>
> Signed-off-by: Rob Clark <robdclark@gmail.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  hw/dmx/dmxinit.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
> index 7a50aeb..7de402b 100644
> --- a/hw/dmx/dmxinit.c
> +++ b/hw/dmx/dmxinit.c
> @@ -740,10 +740,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
>      /* Check if GLX extension exists on all back-end servers */
>      for (i = 0; i < dmxNumScreens; i++)
>          glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
> -#endif
>
>      if (serverGeneration == 1)
>          dmxAddExtensions(glxSupported);
> +#endif
>
>      /* Tell dix layer about the backend displays */
>      for (i = 0; i < dmxNumScreens; i++) {
> --
> 1.8.0.1
>
> _______________________________________________
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel

Patch

diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index 7a50aeb..7de402b 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -740,10 +740,10 @@  InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
     /* Check if GLX extension exists on all back-end servers */
     for (i = 0; i < dmxNumScreens; i++)
         glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
-#endif
 
     if (serverGeneration == 1)
         dmxAddExtensions(glxSupported);
+#endif
 
     /* Tell dix layer about the backend displays */
     for (i = 0; i < dmxNumScreens; i++) {