LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File redef-keysym.patch of Package LibVNCServer (Project devel:libraries:c_c++)

Index: LibVNCServer-0.8.2/rfb/keysym.h
===================================================================
--- LibVNCServer-0.8.2.orig/rfb/keysym.h
+++ LibVNCServer-0.8.2/rfb/keysym.h
@@ -50,15 +50,29 @@ SOFTWARE.
 
 ******************************************************************/
 
 /* default keysyms */
-#define XK_MISCELLANY
-#define XK_XKB_KEYS
-#define XK_LATIN1
-#define XK_LATIN2
-#define XK_LATIN3
-#define XK_LATIN4
-#define XK_GREEK
+#ifndef XK_MISCELLANY
+# define _XK_MISCELLANY
+#endif
+#ifndef XK_XKB_KEYS
+# define _XK_XKB_KEYS
+#endif
+#ifndef XK_LATIN1
+# define _XK_LATIN1
+#endif
+#ifndef XK_LATIN2
+# define _XK_LATIN2
+#endif
+#ifndef XK_LATIN3
+# define _XK_LATIN3
+#endif
+#ifndef XK_LATIN4
+# define _XK_LATIN4
+#endif
+#ifndef XK_GREEK
+# define _XK_GREEK
+#endif
 
 /* $TOG: keysymdef.h /main/25 1997/06/21 10:54:51 kaleb $ */
 
 /***********************************************************
@@ -110,11 +124,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE
 SOFTWARE.
 
 ******************************************************************/
 
-#define XK_VoidSymbol		0xFFFFFF	/* void symbol */
+#ifndef XK_VoidSymbol
+# define XK_VoidSymbol		0xFFFFFF	/* void symbol */
+#endif
 
-#ifdef XK_MISCELLANY
+#ifdef _XK_MISCELLANY
 /*
  * TTY Functions, cleverly chosen to map to ascii, for convenience of
  * programming, but could have been arbitrary (at the cost of lookup
  * tables in client code.
@@ -330,9 +346,9 @@ SOFTWARE.
  * ISO 9995 Function and Modifier Keys
  * Byte 3 = 0xFE
  */
 
-#ifdef XK_XKB_KEYS
+#ifdef _XK_XKB_KEYS
 #define	XK_ISO_Lock					0xFE01
 #define	XK_ISO_Level2_Latch				0xFE02
 #define	XK_ISO_Level3_Shift				0xFE03
 #define	XK_ISO_Level3_Latch				0xFE04
@@ -445,9 +461,9 @@ SOFTWARE.
  * 3270 Terminal Keys
  * Byte 3 = 0xFD
  */
 
-#ifdef XK_3270
+#ifdef _XK_3270
 #define XK_3270_Duplicate      0xFD01
 #define XK_3270_FieldMark      0xFD02
 #define XK_3270_Right2         0xFD03
 #define XK_3270_Left2          0xFD04
@@ -482,9 +498,9 @@ SOFTWARE.
 /*
  *  Latin 1
  *  Byte 3 = 0
  */
-#ifdef XK_LATIN1
+#ifdef _XK_LATIN1
 #define XK_space               0x020
 #define XK_exclam              0x021
 #define XK_quotedbl            0x022
 #define XK_numbersign          0x023
@@ -686,9 +702,9 @@ SOFTWARE.
  *   Latin 2
  *   Byte 3 = 1
  */
 
-#ifdef XK_LATIN2
+#ifdef _XK_LATIN2
 #define XK_Aogonek             0x1a1
 #define XK_breve               0x1a2
 #define XK_Lstroke             0x1a3
 #define XK_Lcaron              0x1a5
@@ -751,9 +767,9 @@ SOFTWARE.
  *   Latin 3
  *   Byte 3 = 2
  */
 
-#ifdef XK_LATIN3
+#ifdef _XK_LATIN3
 #define XK_Hstroke             0x2a1
 #define XK_Hcircumflex         0x2a6
 #define XK_Iabovedot           0x2a9
 #define XK_Gbreve              0x2ab
@@ -782,9 +798,9 @@ SOFTWARE.
  *   Latin 4
  *   Byte 3 = 3
  */
 
-#ifdef XK_LATIN4
+#ifdef _XK_LATIN4
 #define XK_kra                 0x3a2
 #define XK_kappa               0x3a2	/* deprecated */
 #define XK_Rcedilla            0x3a3
 #define XK_Itilde              0x3a5
@@ -826,9 +842,9 @@ SOFTWARE.
  * Katakana
  * Byte 3 = 4
  */
 
-#ifdef XK_KATAKANA
+#ifdef _XK_KATAKANA
 #define XK_overline				       0x47e
 #define XK_kana_fullstop                               0x4a1
 #define XK_kana_openingbracket                         0x4a2
 #define XK_kana_closingbracket                         0x4a3
@@ -904,9 +920,9 @@ SOFTWARE.
  *  Arabic
  *  Byte 3 = 5
  */
 
-#ifdef XK_ARABIC
+#ifdef _XK_ARABIC
 #define XK_Arabic_comma                                0x5ac
 #define XK_Arabic_semicolon                            0x5bb
 #define XK_Arabic_question_mark                        0x5bf
 #define XK_Arabic_hamza                                0x5c1
@@ -961,9 +977,9 @@ SOFTWARE.
 /*
  * Cyrillic
  * Byte 3 = 6
  */
-#ifdef XK_CYRILLIC
+#ifdef _XK_CYRILLIC
 #define XK_Serbian_dje                                 0x6a1
 #define XK_Macedonia_gje                               0x6a2
 #define XK_Cyrillic_io                                 0x6a3
 #define XK_Ukrainian_ie                                0x6a4
@@ -1076,9 +1092,9 @@ SOFTWARE.
  * Greek
  * Byte 3 = 7
  */
 
-#ifdef XK_GREEK
+#ifdef _XK_GREEK
 #define XK_Greek_ALPHAaccent                           0x7a1
 #define XK_Greek_EPSILONaccent                         0x7a2
 #define XK_Greek_ETAaccent                             0x7a3
 #define XK_Greek_IOTAaccent                            0x7a4
@@ -1158,9 +1174,9 @@ SOFTWARE.
  * Technical
  * Byte 3 = 8
  */
 
-#ifdef XK_TECHNICAL
+#ifdef _XK_TECHNICAL
 #define XK_leftradical                                 0x8a1
 #define XK_topleftradical                              0x8a2
 #define XK_horizconnector                              0x8a3
 #define XK_topintegral                                 0x8a4
@@ -1215,9 +1231,9 @@ SOFTWARE.
  *  Special
  *  Byte 3 = 9
  */
 
-#ifdef XK_SPECIAL
+#ifdef _XK_SPECIAL
 #define XK_blank                                       0x9df
 #define XK_soliddiamond                                0x9e0
 #define XK_checkerboard                                0x9e1
 #define XK_ht                                          0x9e2
@@ -1247,9 +1263,9 @@ SOFTWARE.
  *  Publishing
  *  Byte 3 = a
  */
 
-#ifdef XK_PUBLISHING
+#ifdef _XK_PUBLISHING
 #define XK_emspace                                     0xaa1
 #define XK_enspace                                     0xaa2
 #define XK_em3space                                    0xaa3
 #define XK_em4space                                    0xaa4
@@ -1338,9 +1354,9 @@ SOFTWARE.
  *  APL
  *  Byte 3 = b
  */
 
-#ifdef XK_APL
+#ifdef _XK_APL
 #define XK_leftcaret                                   0xba3
 #define XK_rightcaret                                  0xba6
 #define XK_downcaret                                   0xba8
 #define XK_upcaret                                     0xba9
@@ -1365,9 +1381,9 @@ SOFTWARE.
  * Hebrew
  * Byte 3 = c
  */
 
-#ifdef XK_HEBREW
+#ifdef _XK_HEBREW
 #define XK_hebrew_doublelowline                        0xcdf
 #define XK_hebrew_aleph                                0xce0
 #define XK_hebrew_bet                                  0xce1
 #define XK_hebrew_beth                                 0xce1  /* deprecated */
@@ -1413,9 +1429,9 @@ SOFTWARE.
  * Thai
  * Byte 3 = d
  */
 
-#ifdef XK_THAI
+#ifdef _XK_THAI
 #define XK_Thai_kokai					0xda1
 #define XK_Thai_khokhai					0xda2
 #define XK_Thai_khokhuat				0xda3
 #define XK_Thai_khokhwai				0xda4
@@ -1505,9 +1521,9 @@ SOFTWARE.
  *   Korean
  *   Byte 3 = e
  */
 
-#ifdef XK_KOREAN
+#ifdef _XK_KOREAN
 
 #define XK_Hangul		0xff31    /* Hangul start/stop(toggle) */
 #define XK_Hangul_Start		0xff32    /* Hangul start */
 #define XK_Hangul_End		0xff33    /* Hangul end, English start */