Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / state_trackers / egl / x11 / native_x11.h

diff --git a/src/gallium/state_trackers/egl/x11/native_x11.h b/src/gallium/state_trackers/egl/x11/native_x11.h
index e16da935c0b85bcf4a7c56a0f68a14d25d665238..8945117276e83698e95bb45615ae7ac14b68e698 100644 (file)
--- a/src/gallium/state_trackers/egl/x11/native_x11.h
+++ b/src/gallium/state_trackers/egl/x11/native_x11.h
@@ -27,13 +27,16 @@
 #define _NATIVE_X11_H_
 
 #include "common/native.h"
+#include <X11/Xlib.h>
 
 struct native_display *
-x11_create_ximage_display(EGLNativeDisplayType dpy,
-                          struct native_event_handler *event_handler);
+x11_create_ximage_display(Display *dpy,
+                          struct native_event_handler *event_handler,
+                          void *user_data);
 
 struct native_display *
-x11_create_dri2_display(EGLNativeDisplayType dpy,
-                        struct native_event_handler *event_handler);
+x11_create_dri2_display(Display *dpy,
+                        struct native_event_handler *event_handler,
+                        void *user_data);
 
 #endif /* _NATIVE_X11_H_ */