X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmain%2Feglcontext.h;h=69bf77d8aff7702c6af787fa5ee6b350d21de929;hb=c59ad265df655a19285d813144f6b76d7f49d7fd;hp=73badc5d6b9621046f29049d518499744256cf01;hpb=877128505431adaf817dc8069172ebe4a1cdf5d8;p=mesa.git

diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h
index 73badc5d6b9..69bf77d8aff 100644
--- a/src/egl/main/eglcontext.h
+++ b/src/egl/main/eglcontext.h
@@ -31,11 +31,16 @@
 #ifndef EGLCONTEXT_INCLUDED
 #define EGLCONTEXT_INCLUDED
 
+#include "c99_compat.h"
 
 #include "egltypedefs.h"
 #include "egldisplay.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * "Base" class for device driver contexts.
  */
@@ -63,7 +68,7 @@ struct _egl_context
 };
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglInitContext(_EGLContext *ctx, _EGLDisplay *dpy,
                 _EGLConfig *config, const EGLint *attrib_list);
 
@@ -72,7 +77,7 @@ extern EGLBoolean
 _eglQueryContext(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx, EGLint attribute, EGLint *value);
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglBindContext(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read,
                 _EGLContext **old_ctx,
                 _EGLSurface **old_draw, _EGLSurface **old_read);
@@ -81,7 +86,7 @@ _eglBindContext(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read,
 /**
  * Increment reference count for the context.
  */
-static INLINE _EGLContext *
+static inline _EGLContext *
 _eglGetContext(_EGLContext *ctx)
 {
    if (ctx)
@@ -93,7 +98,7 @@ _eglGetContext(_EGLContext *ctx)
 /**
  * Decrement reference count for the context.
  */
-static INLINE EGLBoolean
+static inline EGLBoolean
 _eglPutContext(_EGLContext *ctx)
 {
    return (ctx) ? _eglPutResource(&ctx->Resource) : EGL_FALSE;
@@ -104,7 +109,7 @@ _eglPutContext(_EGLContext *ctx)
  * Link a context to its display and return the handle of the link.
  * The handle can be passed to client directly.
  */
-static INLINE EGLContext
+static inline EGLContext
 _eglLinkContext(_EGLContext *ctx)
 {
    _eglLinkResource(&ctx->Resource, _EGL_RESOURCE_CONTEXT);
@@ -116,7 +121,7 @@ _eglLinkContext(_EGLContext *ctx)
  * Unlink a linked context from its display.
  * Accessing an unlinked context should generate EGL_BAD_CONTEXT error.
  */
-static INLINE void
+static inline void
 _eglUnlinkContext(_EGLContext *ctx)
 {
    _eglUnlinkResource(&ctx->Resource, _EGL_RESOURCE_CONTEXT);
@@ -127,7 +132,7 @@ _eglUnlinkContext(_EGLContext *ctx)
  * Lookup a handle to find the linked context.
  * Return NULL if the handle has no corresponding linked context.
  */
-static INLINE _EGLContext *
+static inline _EGLContext *
 _eglLookupContext(EGLContext context, _EGLDisplay *dpy)
 {
    _EGLContext *ctx = (_EGLContext *) context;
@@ -140,7 +145,7 @@ _eglLookupContext(EGLContext context, _EGLDisplay *dpy)
 /**
  * Return the handle of a linked context, or EGL_NO_CONTEXT.
  */
-static INLINE EGLContext
+static inline EGLContext
 _eglGetContextHandle(_EGLContext *ctx)
 {
    _EGLResource *res = (_EGLResource *) ctx;
@@ -149,4 +154,8 @@ _eglGetContextHandle(_EGLContext *ctx)
 }
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* EGLCONTEXT_INCLUDED */