[PATCH 5/6] glx: Flatten -DXFree86Server

[Dave Airlie]

On Tue, Mar 15, 2011 at 5:31 AM, Adam Jackson <ajax at redhat.com> wrote:
> Always defined by the makefile, so, just get rid of it.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  glx/Makefile.am |    1 -
>  glx/glapi.c     |   43 -------------------------------------------
>  2 files changed, 0 insertions(+), 44 deletions(-)
>
> diff --git a/glx/Makefile.am b/glx/Makefile.am
> index 8c7f7a5..72531f2 100644
> --- a/glx/Makefile.am
> +++ b/glx/Makefile.am
> @@ -11,7 +11,6 @@ AM_CFLAGS = \
>        @XLIB_CFLAGS@ \
>        @LIBDRM_CFLAGS@ \
>        @DRIPROTO_CFLAGS@ \
> -       -DXFree86Server \
>        @GLX_DEFINES@ \
>        @GLX_ARCH_DEFINES@
>
> diff --git a/glx/glapi.c b/glx/glapi.c
> index dcebc56..4bb07e2 100644
> --- a/glx/glapi.c
> +++ b/glx/glapi.c
> @@ -231,9 +231,6 @@ _glapi_get_dispatch(void)
>  # endif
>  #endif
>
> -#if !defined(DISPATCH_FUNCTION_SIZE) && !defined(XFree86Server) && !defined(XGLServer)
> -# define NEED_FUNCTION_POINTER
> -#endif
>
>  /* The code in this file is auto-generated with Python */

^^^

Do we reaally want to clean this up or the generator scripts?

Dave.