[PATCH 1/3] dix: fix redundant redeclaration warnings in dixfont

[Jon TURNEY]

On 15/10/2012 07:43, Yaakov (Cygwin/X) wrote:
> From: Yaakov Selkowitz <yselkowitz-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f at public.gmane.org>
> 
> These functions are already declared in <X11/fonts/fontproto.h>.
> Redeclaring them just for _X_EXPORT causes tons of warnings throughout
> xserver which can be avoided by handling this in the function
> definitions instead.
> 
> Signed-off-by: Yaakov Selkowitz <yselkowitz-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f at public.gmane.org>
> ---
> 
>  dix/dixfonts.c    |    9 +++++++++
>  include/dixfont.h |   38 --------------------------------------
>  2 files changed, 9 insertions(+), 38 deletions(-)
> 
> diff --git a/dix/dixfonts.c b/dix/dixfonts.c
> index ad21860..feb765d 100644
> --- a/dix/dixfonts.c
> +++ b/dix/dixfonts.c
> @@ -1823,12 +1823,14 @@ InitFonts(void)
>      register_fpe_functions();
>  }
>  
> +_X_EXPORT
>  int
>  GetDefaultPointSize(void)
>  {
>      return 120;
>  }

I also had a go at fixing this annoying warning (see [1]), but I don't think
this is quite straightforward, as sdksyms.sh only looks at the headers to
build the list of symbols which must be referenced.

[1] http://lists.x.org/archives/xorg-devel/2012-January/028887.html