xorg/xserver: [PATCH] Janitor: change include/xkbsrv.h include guard symbol.

Peter Hutterer peter.hutterer at who-t.net
Wed Feb 4 14:47:24 PST 2009


On Wed, Feb 04, 2009 at 07:05:42PM -0200, Paulo César Pereira de Andrade wrote:
> From 2e2ba17bbc5ef92fd52a85b53341651d79411332 Mon Sep 17 00:00:00 2001
> From: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
> Date: Wed, 4 Feb 2009 18:33:57 -0200
> Subject: [PATCH] Janitor: change include/xkbsrv.h include guard symbol.
> 
>   It conflicts with <X11/extensions/XKBsrv.h>.
> 
>   This is a minor "cosmetic" patch, as only a few input modules
> should want to include both files. 


which ones? The drivers shouldn't use the client-side headers.

Cheers,
  Peter

> Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
> ---
>  include/xkbsrv.h |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/xkbsrv.h b/include/xkbsrv.h
> index 4497220..d6d8995 100644
> --- a/include/xkbsrv.h
> +++ b/include/xkbsrv.h
> @@ -24,8 +24,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  
>  ********************************************************/
>  
> -#ifndef _XKBSRV_H_
> -#define	_XKBSRV_H_
> +#ifndef _xkbsrv_h
> +#define	_xkbsrv_h
>  
>  #define XkbAllocClientMap		SrvXkbAllocClientMap
>  #define XkbAllocServerMap		SrvXkbAllocServerMap
> @@ -1002,4 +1002,4 @@ _XFUNCPROTOEND
>  
>  #define	XkbAtomGetString(s)	NameForAtom(s)
>  
> -#endif /* _XKBSRV_H_ */
> +#endif /* _xkbsrv_h */
> -- 
> 1.6.1

> _______________________________________________
> xorg mailing list
> xorg at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xorg
> 



More information about the xorg mailing list