aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt2017-11-08 13:06:55 -0600
committerEric Anholt2017-11-10 14:10:12 -0600
commit8d34bba212342ec0e187cd3602d01edba2d7ec26 (patch)
tree8b50bddbf45c7fb5dbd5eb4633c386905505900f /include/drm/savage_drm.h
parente38de517991a20d7a2abdffc1bc4fd702e8f673c (diff)
downloadexternal-libgbm-8d34bba212342ec0e187cd3602d01edba2d7ec26.tar.gz
external-libgbm-8d34bba212342ec0e187cd3602d01edba2d7ec26.tar.xz
external-libgbm-8d34bba212342ec0e187cd3602d01edba2d7ec26.zip
headers: Sync up some header guard changes from drm-next.
This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'include/drm/savage_drm.h')
-rw-r--r--include/drm/savage_drm.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/drm/savage_drm.h b/include/drm/savage_drm.h
index f7a75eff..26f387b7 100644
--- a/include/drm/savage_drm.h
+++ b/include/drm/savage_drm.h
@@ -26,6 +26,12 @@
26#ifndef __SAVAGE_DRM_H__ 26#ifndef __SAVAGE_DRM_H__
27#define __SAVAGE_DRM_H__ 27#define __SAVAGE_DRM_H__
28 28
29#include "drm.h"
30
31#if defined(__cplusplus)
32extern "C" {
33#endif
34
29#ifndef __SAVAGE_SAREA_DEFINES__ 35#ifndef __SAVAGE_SAREA_DEFINES__
30#define __SAVAGE_SAREA_DEFINES__ 36#define __SAVAGE_SAREA_DEFINES__
31 37
@@ -207,4 +213,8 @@ union drm_savage_cmd_header {
207 } clear1; /* SAVAGE_CMD_CLEAR data */ 213 } clear1; /* SAVAGE_CMD_CLEAR data */
208}; 214};
209 215
216#if defined(__cplusplus)
217}
218#endif
219
210#endif 220#endif