[PATCH 8/9] os/xsha1.c: Include <X11/Xwindows.h> on Win32.

Jon TURNEY jon.turney at dronecode.org.uk
Wed Jan 11 12:13:28 PST 2012


From: Ryan Pavlik <rpavlik at iastate.edu>

Include X11/XWindows.h on WIN32 to avoid redefinition errors which
occur when a header includes windows.h before the specially wrapped
X11/Xwindows.h header.

Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 os/xsha1.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/os/xsha1.c b/os/xsha1.c
index 5ea71da..291f1e9 100644
--- a/os/xsha1.c
+++ b/os/xsha1.c
@@ -64,6 +64,9 @@ int x_sha1_final(void *ctx, unsigned char result[20])
 
 #elif defined(HAVE_SHA1_IN_LIBGCRYPT) /* Use libgcrypt for SHA1 */
 
+# if defined(WIN32) && !defined(__CYGWIN__)
+#  include <X11/Xwindows.h>
+# endif
 # include <gcrypt.h>
 
 void *x_sha1_init(void)
-- 
1.7.5.1



More information about the xorg-devel mailing list