comparison src/video/x11/SDL_x11video.h @ 4746:0c39b36dd104

Merge
author dewyatt
date Tue, 06 Jul 2010 02:07:42 -0400
parents 791b3256fb22
children 15d2c6f40c48
comparison
equal deleted inserted replaced
4745:0aaa54fbd2bc 4746:0c39b36dd104
65 XIM im; 65 XIM im;
66 Uint32 screensaver_activity; 66 Uint32 screensaver_activity;
67 int numwindows; 67 int numwindows;
68 SDL_WindowData **windowlist; 68 SDL_WindowData **windowlist;
69 int windowlistlength; 69 int windowlistlength;
70 int keyboard;
71 Atom WM_DELETE_WINDOW; 70 Atom WM_DELETE_WINDOW;
72 SDL_scancode key_layout[256]; 71 SDL_scancode key_layout[256];
73 } SDL_VideoData; 72 } SDL_VideoData;
74 73
75 extern SDL_bool X11_UseDirectColorVisuals(); 74 extern SDL_bool X11_UseDirectColorVisuals(void);
76 75
77 #endif /* _SDL_x11video_h */ 76 #endif /* _SDL_x11video_h */
78 77
79 /* vi: set ts=4 sw=4 expandtab: */ 78 /* vi: set ts=4 sw=4 expandtab: */