[PATCH xproto] Cygwin/X: Include <strings.h> early to avoid compile errors

Jeremy Huddleston jeremyhu at apple.com
Mon Nov 21 19:57:08 PST 2011


Reviewed and pushed:
   3d7be5c..7f26709  master -> master

I'm going to followup later re: a more complete solution to that ifdef insanity.

On Nov 14, 2011, at 15:22, Yaakov (Cygwin/X) wrote:

> From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
> 
> http://lists.x.org/archives/xorg-devel/2011-November/027117.html
> 
> Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
> ---
> This should fix Cygwin.  Whether or not to make this unconditional would
> require further discussion.
> 
> Xfuncs.h |    2 +-
> Xos.h    |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Xfuncs.h b/Xfuncs.h
> index 354b663..2bcf991 100644
> --- a/Xfuncs.h
> +++ b/Xfuncs.h
> @@ -44,7 +44,7 @@ void bcopy();
> #    define bcmp(b1,b2,len) memcmp(b1, b2, len)
> #   else
> #    include <string.h>
> -#    if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__)
> +#    if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__)
> #     include <strings.h>
> #    endif
> #    define _XFUNCS_H_INCLUDED_STRING_H
> diff --git a/Xos.h b/Xos.h
> index 646716b..044d22b 100644
> --- a/Xos.h
> +++ b/Xos.h
> @@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
>  */
> 
> # include <string.h>
> -# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun)
> +# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__)
> #  include <strings.h>
> # else
> #  ifndef index
> -- 
> 1.7.5.1
> 
> _______________________________________________
> 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
> 



More information about the xorg-devel mailing list