diff options
| author | Emil Velikov <[email protected]> | 2015-11-25 20:43:03 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-03-09 17:21:39 +0000 |
| commit | 373f118c6c750d717fd0727fc3fc191828714c6f (patch) | |
| tree | 09eebda7e8291ed3cd01960aaa84728a9c36a114 /src/gallium/include | |
| parent | 69d389c52f91e4d36e740f804a36b50af657a786 (diff) | |
gallium: do not wrap header inclusion in
Add one missing extern C guard within include/pipe/p_video_enums.h, and
remove the wrapping throughout gallium.
On Haiku one could even use the gallium debug_printf() although
that's another topic.
v2: Leave dbghelp.h as is (Jose)
Cc: Jose Fonseca <[email protected]>
Cc: Brian Paul <[email protected]>
Cc: Alexander von Gluck IV <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_format.h | 4 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_video_codec.h | 4 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_video_enums.h | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index ab18523a80c..b22baa9c650 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -29,12 +29,12 @@ #ifndef PIPE_FORMAT_H #define PIPE_FORMAT_H +#include "p_config.h" + #ifdef __cplusplus extern "C" { #endif -#include "p_config.h" - /** * Formats for textures, surfaces and vertex data */ diff --git a/src/gallium/include/pipe/p_video_codec.h b/src/gallium/include/pipe/p_video_codec.h index 196d00bc546..b5575ab9afa 100644 --- a/src/gallium/include/pipe/p_video_codec.h +++ b/src/gallium/include/pipe/p_video_codec.h @@ -28,12 +28,12 @@ #ifndef PIPE_VIDEO_CONTEXT_H #define PIPE_VIDEO_CONTEXT_H +#include "pipe/p_video_state.h" + #ifdef __cplusplus extern "C" { #endif -#include "pipe/p_video_state.h" - struct pipe_screen; struct pipe_surface; struct pipe_macroblock; diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index 9a20146f43e..aff7842a888 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -28,6 +28,10 @@ #ifndef PIPE_VIDEO_ENUMS_H #define PIPE_VIDEO_ENUMS_H +#ifdef __cplusplus +extern "C" { +#endif + enum pipe_video_format { PIPE_VIDEO_FORMAT_UNKNOWN = 0, @@ -87,4 +91,8 @@ enum pipe_video_entrypoint PIPE_VIDEO_ENTRYPOINT_ENCODE }; +#if defined(__cplusplus) +} +#endif + #endif /* PIPE_VIDEO_ENUMS_H */ |