OSDN Git Service
(root)
/
android-x86
/
external-libdrm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xf86drm: dedupe drmGetDeviceName() logic
[android-x86/external-libdrm.git]
/
libdrm_macros.h
diff --git
a/libdrm_macros.h
b/libdrm_macros.h
index
211fab2
..
0dca827
100644
(file)
--- a/
libdrm_macros.h
+++ b/
libdrm_macros.h
@@
-25,8
+25,10
@@
#if HAVE_VISIBILITY
# define drm_private __attribute__((visibility("hidden")))
#if HAVE_VISIBILITY
# define drm_private __attribute__((visibility("hidden")))
+# define drm_public __attribute__((visibility("default")))
#else
# define drm_private
#else
# define drm_private
+# define drm_public
#endif
#endif
@@
-46,8
+48,6
@@
#if defined(ANDROID) && !defined(__LP64__)
#include <errno.h> /* for EINVAL */
#if defined(ANDROID) && !defined(__LP64__)
#include <errno.h> /* for EINVAL */
-extern void *__mmap2(void *, size_t, int, int, int, size_t);
-
static inline void *drm_mmap(void *addr, size_t length, int prot, int flags,
int fd, loff_t offset)
{
static inline void *drm_mmap(void *addr, size_t length, int prot, int flags,
int fd, loff_t offset)
{
@@
-57,7
+57,7
@@
static inline void *drm_mmap(void *addr, size_t length, int prot, int flags,
return MAP_FAILED;
}
return MAP_FAILED;
}
- return
__mmap2(addr, length, prot, flags, fd, (size_t) (offset >> 12)
);
+ return
mmap64(addr, length, prot, flags, fd, offset
);
}
# define drm_munmap(addr, length) \
}
# define drm_munmap(addr, length) \