libfreerdp-rail: fix conflict with IME definitions on Windows
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 15 Oct 2013 19:20:12 +0000 (15:20 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 15 Oct 2013 19:20:12 +0000 (15:20 -0400)
include/freerdp/rail.h

index c605656..b15ad0f 100644 (file)
@@ -159,6 +159,7 @@ enum SPI_MASK
 #define IME_STATE_CLOSED                               0x00000000
 #define IME_STATE_OPEN                                 0x00000001
 
+#ifndef _IME_CMODES_
 #define IME_CMODE_NATIVE                               0x00000001
 #define IME_CMODE_KATAKANA                             0x00000002
 #define IME_CMODE_FULLSHAPE                            0x00000008
@@ -170,13 +171,16 @@ enum SPI_MASK
 #define IME_CMODE_EUDC                                 0x00000200
 #define IME_CMODE_SYMBOL                               0x00000400
 #define IME_CMODE_FIXED                                        0x00000800
+#endif
 
+#ifndef _IMM_
 #define IME_SMODE_NONE                                 0x00000000
 #define IME_SMODE_PLURALCASE                           0x00000001
 #define IME_SMODE_SINGLECONVERT                                0x00000002
 #define IME_SMODE_AUTOMATIC                            0x00000004
 #define IME_SMODE_PHRASEPREDICT                                0x00000008
 #define IME_SMODE_CONVERSATION                         0x00000010
+#endif
 
 #define KANA_MODE_OFF                                  0x00000000
 #define KANA_MODE_ON                                   0x00000001