summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@armlinux.org.uk>2017-02-11 15:55:47 +0000
committerRussell King <rmk@armlinux.org.uk>2017-02-11 17:21:06 +0000
commit073e4e5a4e953ee5cb8525640959c946823ca788 (patch)
treecf324fc9d54d0284fff23e9aaa16f4d3fc49b820
parent9b9099bc6af81e281eb6603ce93fc5ac48601bb9 (diff)
etnaviv: remove unnecessary <etnaviv/viv.h> includes
Remove <etnaviv/viv.h> from etnaviv_utils.h and etnaviv_dummy.c, neither of which actually make use of definitions from these files. Add <stdlib.h> to etnaviv_dummy.c for the definition of NULL, and <stdint.h> with declarations for the etna_bo and viv_conn structures. Signed-off-by: Russell King <rmk@armlinux.org.uk>
-rw-r--r--etnaviv/etnaviv_compat.h5
-rw-r--r--etnaviv/etnaviv_dummy.c2
-rw-r--r--etnaviv/etnaviv_utils.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/etnaviv/etnaviv_compat.h b/etnaviv/etnaviv_compat.h
index a6050a3..4c11f2c 100644
--- a/etnaviv/etnaviv_compat.h
+++ b/etnaviv/etnaviv_compat.h
@@ -7,6 +7,11 @@
#ifndef ETNAVIV_COMPAT_H
#define ETNAVIV_COMPAT_H
+#include <stdint.h>
+
+struct etna_bo;
+struct viv_conn;
+
/*
* Etnaviv itself does not provide these functions. We'd like these
* to be named this way, but some incompatible etnaviv functions clash.
diff --git a/etnaviv/etnaviv_dummy.c b/etnaviv/etnaviv_dummy.c
index a4dfa27..8d70018 100644
--- a/etnaviv/etnaviv_dummy.c
+++ b/etnaviv/etnaviv_dummy.c
@@ -1,7 +1,7 @@
/*
* libetnaviv "compatibility" with additional etnaviv/drm APIs
*/
-#include <etnaviv/viv.h>
+#include <stdlib.h>
#include "etnaviv_compat.h"
int etna_bo_flink(struct etna_bo *bo, uint32_t *name)
diff --git a/etnaviv/etnaviv_utils.h b/etnaviv/etnaviv_utils.h
index 36ca4fe..9d66f4c 100644
--- a/etnaviv/etnaviv_utils.h
+++ b/etnaviv/etnaviv_utils.h
@@ -9,8 +9,6 @@
#include "utils.h"
-#include <etnaviv/viv.h>
-
struct etnaviv;
struct etnaviv_pixmap;