-#ifndef XMESA_H
-#define XMESA_H
+#ifndef XM_API_H
+#define XM_API_H
-#include "main/core.h" /* for gl_config */
+#include "main/mtypes.h" /* for gl_config */
#include "state_tracker/st_api.h"
#include "os/os_thread.h"
struct xmesa_display {
- pipe_mutex mutex;
+ mtx_t mutex;
Display *display;
struct pipe_screen *screen;
extern const char *
xmesa_get_name(void);
-extern void
+extern int
xmesa_init(Display *dpy);
extern XMesaBuffer