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

Yaakov (Cygwin/X) yselkowitz at users.sourceforge.net
Mon Nov 14 15:22:30 PST 2011


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



More information about the xorg-devel mailing list