From: louyihua <SuperMouseLyh@hotmail.com>
Date: Wed, 21 Dec 2011 00:48:13 +0000 (+0800)
Subject: libfreerdp-core: avoid macro redefinition under win32
X-Git-Tag: 1.0-beta4~9^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95b03f96eff0422fde2117f098729bf9352e6dbf;p=platform%2Fupstream%2Ffreerdp.git

libfreerdp-core: avoid macro redefinition under win32
---

diff --git a/include/freerdp/secondary.h b/include/freerdp/secondary.h
index b4c3138..382b322 100644
--- a/include/freerdp/secondary.h
+++ b/include/freerdp/secondary.h
@@ -49,12 +49,14 @@
 #define BS_PATTERN			0x03
 #endif
 
-#define HS_HORIZONTAL			0x00
+#ifndef _WIN32
+#define HS_HORIZONTAL		0x00
 #define HS_VERTICAL			0x01
-#define HS_FDIAGONAL			0x02
-#define HS_BDIAGONAL			0x03
+#define HS_FDIAGONAL		0x02
+#define HS_BDIAGONAL		0x03
 #define HS_CROSS			0x04
-#define HS_DIAGCROSS			0x05
+#define HS_DIAGCROSS		0x05
+#endif
 
 #define SO_FLAG_DEFAULT_PLACEMENT	0x01
 #define SO_HORIZONTAL			0x02