浏览代码

x11: Fixed incorrect function signature for XkbSetDetectableAutoRepeat.

It needs to use Bool (which is an int) and not BOOL (which is CARD8), which
causes problems on platforms with different byte order and alignment, etc.

Fixes Bugzilla #4326.
Ryan C. Gordon 7 年之前
父节点
当前提交
1ec56f7302
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/video/x11/SDL_x11keyboard.c
  2. 1 1
      src/video/x11/SDL_x11sym.h

+ 1 - 1
src/video/x11/SDL_x11keyboard.c

@@ -266,7 +266,7 @@ X11_InitKeyboard(_THIS)
     int best_distance;
     int best_distance;
     int best_index;
     int best_index;
     int distance;
     int distance;
-    BOOL xkb_repeat = 0;
+    Bool xkb_repeat = 0;
     
     
     X11_XAutoRepeatOn(data->display);
     X11_XAutoRepeatOn(data->display);
 
 

+ 1 - 1
src/video/x11/SDL_x11sym.h

@@ -180,7 +180,7 @@ SDL_X11_SYM(Status,XkbGetUpdatedMap,(Display* a,unsigned int b,XkbDescPtr c),(a,
 SDL_X11_SYM(XkbDescPtr,XkbGetMap,(Display* a,unsigned int b,unsigned int c),(a,b,c),return)
 SDL_X11_SYM(XkbDescPtr,XkbGetMap,(Display* a,unsigned int b,unsigned int c),(a,b,c),return)
 SDL_X11_SYM(void,XkbFreeClientMap,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
 SDL_X11_SYM(void,XkbFreeClientMap,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
 SDL_X11_SYM(void,XkbFreeKeyboard,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
 SDL_X11_SYM(void,XkbFreeKeyboard,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
-SDL_X11_SYM(BOOL,XkbSetDetectableAutoRepeat,(Display* a, BOOL b, BOOL* c),(a,b,c),return)
+SDL_X11_SYM(Bool,XkbSetDetectableAutoRepeat,(Display* a, Bool b, Bool* c),(a,b,c),return)
 #endif
 #endif
 
 
 #if NeedWidePrototypes
 #if NeedWidePrototypes