[PATCH] Unifdef XGLServer

[Julien Cristau]

On Tue, Mar  1, 2011 at 16:51:48 -0500, Adam Jackson wrote:

> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  glx/glapi.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/glx/glapi.c b/glx/glapi.c
> index fd4eb92..d16cd85 100644
> --- a/glx/glapi.c
> +++ b/glx/glapi.c
> @@ -372,7 +372,7 @@ _glapi_get_dispatch(void)
>  # endif
>  #endif
>  
> -#if !defined(DISPATCH_FUNCTION_SIZE) && !defined(XFree86Server) && !defined(XGLServer)
> +#if !defined(DISPATCH_FUNCTION_SIZE) && !defined(XFree86Server) 
>  # define NEED_FUNCTION_POINTER
>  #endif
>  
> @@ -413,7 +413,7 @@ get_static_proc_offset(const char *funcName)
>  }
>  
>  
> -#if !defined(XFree86Server) && !defined(XGLServer)
> +#if !defined(XFree86Server) 
>  #ifdef USE_X86_ASM
>  
>  #if defined( GLX_USE_TLS )
> @@ -895,7 +895,7 @@ _glapi_get_proc_address(const char *funcName)
>        }
>     }
>  
> -#if !defined( XFree86Server ) && !defined( XGLServer )
> +#if !defined( XFree86Server ) 
>     /* search static functions */
>     {
>        const _glapi_proc func = get_static_proc_address(funcName);

Reviewed-by: Julien Cristau <jcristau at debian.org>

Cheers,
Julien