aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz2018-04-13 18:31:33 -0500
committerJohn Stultz2018-04-13 18:31:33 -0500
commit84f838d71a75125b14d361f0ed7d23a0ac521edf (patch)
treea7694dfdab2ca2b1d32e25071589c7ea0a992bd6 /libdrm_macros.h
parent2f9aea0661550a43c3d2ac33a5bc286870edd34e (diff)
parent35affe89d5f617a972b1cfee00c51cbe9e7c64a2 (diff)
downloadexternal-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.tar.gz
external-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.tar.xz
external-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.zip
Merge remote-tracking branch 'freedesktop/master' into aosp/master
This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'libdrm_macros.h')
-rw-r--r--libdrm_macros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libdrm_macros.h b/libdrm_macros.h
index b88fdcef..3134ae96 100644
--- a/libdrm_macros.h
+++ b/libdrm_macros.h
@@ -23,7 +23,7 @@
23#ifndef LIBDRM_LIBDRM_H 23#ifndef LIBDRM_LIBDRM_H
24#define LIBDRM_LIBDRM_H 24#define LIBDRM_LIBDRM_H
25 25
26#if defined(HAVE_VISIBILITY) 26#if HAVE_VISIBILITY
27# define drm_private __attribute__((visibility("hidden"))) 27# define drm_private __attribute__((visibility("hidden")))
28#else 28#else
29# define drm_private 29# define drm_private