[PATCH:libXv 4/7] Require ANSI C89 pre-processor, drop pre-C89 token pasting support

[Mark Kettenis]

> From: Alan Coopersmith <alan.coopersmith at oracle.com>
> Date: Sun, 23 Jun 2013 11:53:47 -0700
> 
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

Reviewed-by: Mark Kettenis <kettenis at openbsd.org>

> ---
>  src/Xvlibint.h |   15 ---------------
>  1 file changed, 15 deletions(-)
> 
> diff --git a/src/Xvlibint.h b/src/Xvlibint.h
> index 1fdf748..af46605 100644
> --- a/src/Xvlibint.h
> +++ b/src/Xvlibint.h
> @@ -44,7 +44,6 @@ SOFTWARE.
>  #include <X11/extensions/Xvproto.h>
>  #include <X11/extensions/Xvlib.h>
>  
> -#if !defined(UNIXCPP)
>  #define XvGetReq(name, req) \
>      WORD64ALIGN \
>      if ((dpy->bufptr + SIZEOF(xv##name##Req)) > dpy->bufmax) \
> @@ -56,18 +55,4 @@ SOFTWARE.
>      dpy->bufptr += SIZEOF(xv##name##Req); \
>      dpy->request++
>  
> -#else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
> -#define XvGetReq(name, req) \
> -    WORD64ALIGN \
> -    if ((dpy->bufptr + SIZEOF(xv/**/name/**/Req)) > dpy->bufmax) \
> -        _XFlush(dpy); \
> -    req = (xv/**/name/**/Req *)(dpy->last_req = dpy->bufptr); \
> -    req->reqType = info->codes->major_opcode; \
> -    req->xvReqType = xv_/**/name; \
> -    req->length = (SIZEOF(xv/**/name/**/Req)) >> 2; \
> -    dpy->bufptr += SIZEOF(xv/**/name/**/Req); \
> -    dpy->request++
> -#endif
> -
> -
>  #endif /* XVLIBINT_H */
> -- 
> 1.7.9.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>