gallium: Fix mismatched ifdef-guards

[mesa.git] / src / gallium / auxiliary / target-helpers / inline_debug_helper.h

diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index 2443bf214682893711ce0808f7134b33eabf4833..08aea33071038f5c8d7da73824bbe78ff52fb41e 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -8,23 +8,16 @@
 
 
 /* Helper function to wrap a screen with
- * one or more debug driver: rbug, trace.
+ * one or more debug drivers.
  */
 
-#ifdef GALLIUM_DDEBUG
-#include "ddebug/dd_public.h"
-#endif
-
-#ifdef GALLIUM_TRACE
-#include "trace/tr_public.h"
-#endif
+#include "driver_ddebug/dd_public.h"
+#include "driver_trace/tr_public.h"
+#include "driver_rbug/rbug_public.h"
+#include "driver_noop/noop_public.h"
 
-#ifdef GALLIUM_RBUG
-#include "rbug/rbug_public.h"
-#endif
-
-#ifdef GALLIUM_NOOP
-#include "noop/noop_public.h"
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 /*
@@ -34,21 +27,10 @@
 static inline struct pipe_screen *
 debug_screen_wrap(struct pipe_screen *screen)
 {
-#if defined(GALLIUM_DDEBUG)
    screen = ddebug_screen_create(screen);
-#endif
-
-#if defined(GALLIUM_RBUG)
    screen = rbug_screen_create(screen);
-#endif
-
-#if defined(GALLIUM_TRACE)
    screen = trace_screen_create(screen);
-#endif
-
-#if defined(GALLIUM_NOOP)
    screen = noop_screen_create(screen);
-#endif
 
    if (debug_get_bool_option("GALLIUM_TESTS", FALSE))
       util_run_tests(screen);
@@ -56,4 +38,8 @@ debug_screen_wrap(struct pipe_screen *screen)
    return screen;
 }
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif // INLINE_DEBUG_HELPER_H