From 95b03f96eff0422fde2117f098729bf9352e6dbf Mon Sep 17 00:00:00 2001 From: louyihua Date: Wed, 21 Dec 2011 08:48:13 +0800 Subject: [PATCH] libfreerdp-core: avoid macro redefinition under win32 --- include/freerdp/secondary.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 -- 2.7.4