[PATCH 1/3] Fix missing <string.h> include.

Julien Cristau jcristau at debian.org
Sat Dec 4 03:30:03 PST 2010


On Thu, Nov 11, 2010 at 16:03:35 +0100, Cyril Brulebois wrote:

> The following happens otherwise (with -Wall -Werror):
> | In file included from /usr/include/X11/Xfuncs.h:47,
> |                  from ../../include/misc.h:112,
> |                  from ../../include/screenint.h:52,
> |                  from ../../include/scrnintstr.h:52,
> |                  from ../../dix/cursor.c:58:
> | /usr/include/string.h:534: error: conflicting types for ‘xstrcasecmp’
> | ../../include/os.h:488: note: previous declaration of ‘xstrcasecmp’ was here
> | /usr/include/string.h:538: error: conflicting types for ‘xstrncasecmp’
> | ../../include/os.h:493: note: previous declaration of ‘xstrncasecmp’ was here
> 
> Signed-off-by: Cyril Brulebois <kibi at debian.org>
> ---
>  include/os.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/include/os.h b/include/os.h
> index efa202c..fb10435 100644
> --- a/include/os.h
> +++ b/include/os.h
> @@ -51,6 +51,7 @@ SOFTWARE.
>  
>  #include "misc.h"
>  #include <stdarg.h>
> +#include <string.h>
>  
>  #define SCREEN_SAVER_ON   0
>  #define SCREEN_SAVER_OFF  1

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

Cheers,
Julien


More information about the xorg-devel mailing list