From da8de6b757db29e440ec086a8dc8855c5d121eae Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 27 Jul 2018 20:09:37 +0000 Subject: [PATCH] gallium/auxiliary: Extern "c" fixes. Used by C++ code such as Haiku's renderer. Reviewed-by: Brian Paul --- src/gallium/auxiliary/driver_ddebug/dd_public.h | 8 ++++++++ src/gallium/auxiliary/driver_noop/noop_public.h | 8 ++++++++ src/gallium/auxiliary/target-helpers/inline_debug_helper.h | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/src/gallium/auxiliary/driver_ddebug/dd_public.h b/src/gallium/auxiliary/driver_ddebug/dd_public.h index e660765..31c139d 100644 --- a/src/gallium/auxiliary/driver_ddebug/dd_public.h +++ b/src/gallium/auxiliary/driver_ddebug/dd_public.h @@ -30,7 +30,15 @@ struct pipe_screen; +#ifdef __cplusplus +extern "C" { +#endif + struct pipe_screen * ddebug_screen_create(struct pipe_screen *screen); +#ifdef __cplusplus +} +#endif + #endif /* DD_PUBLIC_H_ */ diff --git a/src/gallium/auxiliary/driver_noop/noop_public.h b/src/gallium/auxiliary/driver_noop/noop_public.h index 180ea59..46a7f40 100644 --- a/src/gallium/auxiliary/driver_noop/noop_public.h +++ b/src/gallium/auxiliary/driver_noop/noop_public.h @@ -23,7 +23,15 @@ #ifndef NOOP_PUBLIC_H #define NOOP_PUBLIC_H +#ifdef __cplusplus +extern "C" { +#endif + struct pipe_screen; struct pipe_screen *noop_screen_create(struct pipe_screen *screen); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h index 66d46de..ef22cac 100644 --- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h @@ -16,6 +16,10 @@ #include "driver_rbug/rbug_public.h" #include "driver_noop/noop_public.h" +#ifdef __cplusplus +extern "C" { +#endif + /* * TODO: Audit the following *screen_create() - all of * them should return the original screen on failuire. @@ -35,3 +39,7 @@ debug_screen_wrap(struct pipe_screen *screen) } #endif + +#ifdef __cplusplus +} +#endif -- 2.7.4