diff options
| author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-07 20:45:08 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-07 20:45:08 +0200 |
| commit | 7ca7220ea1d31dbdbf1fe7e6f3e6cc4ff8b0abde (patch) | |
| tree | a4e50f36da7c75c945a2418738e2a84af2b3789d /src/gallium/state_trackers/glx/xlib/xm_api.c | |
| parent | 57abb76e1095d14f54ea8b8d0d2220e209b8656f (diff) | |
| parent | 5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e (diff) | |
Merge branch 'master' into r300g-glsl
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Diffstat (limited to 'src/gallium/state_trackers/glx/xlib/xm_api.c')
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/xm_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 957002ddd5..c76dfb31d2 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -228,7 +228,7 @@ get_drawable_size( Display *dpy, Drawable d, uint *width, uint *height ) * \param width returns width in pixels * \param height returns height in pixels */ -static void +void xmesa_get_window_size(Display *dpy, XMesaBuffer b, GLuint *width, GLuint *height) { |