summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2017-06-09 14:57:20 +0100
committerDaniel Stone <daniels@collabora.com>2017-07-14 14:14:05 +0100
commit2b895475f600b142e9ccbfb3b33009fe68b21162 (patch)
treed192532df7246d7c0d679aecf6e7e296856d9e14 /src/util
parent8821ef4be1009328fc0bbf651feda6377efcd6b6 (diff)
util: Remove u_math from u_vector
u_vector.h doesn't actually use anything from u_math, but it does mean everyone has to pull in src/gallium/auxiliary/util includes. Just remove it, adding a <string.h> include to u_vector.c to cover memcpy. Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/util')
-rw-r--r--src/util/u_vector.c3
-rw-r--r--src/util/u_vector.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/util/u_vector.c b/src/util/u_vector.c
index 37c4245ebe4..4dc7bc22b69 100644
--- a/src/util/u_vector.c
+++ b/src/util/u_vector.c
@@ -20,6 +20,9 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
+
+#include <string.h>
+#include "util/u_math.h"
#include "util/u_vector.h"
int
diff --git a/src/util/u_vector.h b/src/util/u_vector.h
index c0e199cfa5a..cd8a95dcbe3 100644
--- a/src/util/u_vector.h
+++ b/src/util/u_vector.h
@@ -31,7 +31,6 @@
#include <stdint.h>
#include <stdlib.h>
-#include "util/u_math.h"
#include "util/macros.h"
/* TODO - move to u_math.h - name it better etc */