egl/dri2: try to bind old context if bindContext failed

[mesa.git] / src / egl / main / eglarray.h

diff --git a/src/egl/main/eglarray.h b/src/egl/main/eglarray.h
index d07f301f242347400b1c9292e1465e56b68a4b7e..29b7128b68d5a838f6ae4e68225cee2933638dfd 100644 (file)
--- a/src/egl/main/eglarray.h
+++ b/src/egl/main/eglarray.h
@@ -29,10 +29,15 @@
 #ifndef EGLARRAY_INCLUDED
 #define EGLARRAY_INCLUDED
 
+#include "c99_compat.h"
 
 #include "egltypedefs.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef EGLBoolean (*_EGLArrayForEach)(void *elem, void *foreach_data);
 
 
@@ -49,7 +54,7 @@ extern _EGLArray *
 _eglCreateArray(const char *name, EGLint init_size);
 
 
-PUBLIC void
+extern void
 _eglDestroyArray(_EGLArray *array, void (*free_cb)(void *));
 
 
@@ -65,7 +70,7 @@ void *
 _eglFindArray(_EGLArray *array, void *elem);
 
 
-PUBLIC EGLint
+extern EGLint
 _eglFilterArray(_EGLArray *array, void **data, EGLint size,
                 _EGLArrayForEach filter, void *filter_data);
 
@@ -75,11 +80,15 @@ _eglFlattenArray(_EGLArray *array, void *buffer, EGLint elem_size, EGLint size,
                  _EGLArrayForEach flatten);
 
 
-static INLINE EGLint
+static inline EGLint
 _eglGetArraySize(_EGLArray *array)
 {
    return (array) ? array->Size : 0;
 }
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* EGLARRAY_INCLUDED */