Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / math / m_vector.c

diff --git a/src/mesa/math/m_vector.c b/src/mesa/math/m_vector.c
index 65c381f383e488e18fbd0abec8f355146027a8d8..4bded31e096dfe9f2cf2e091d3c66e05dbbfe127 100644 (file)
--- a/src/mesa/math/m_vector.c
+++ b/src/mesa/math/m_vector.c
@@ -30,7 +30,6 @@
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "main/imports.h"
 
 #include "m_vector.h"
 
@@ -101,7 +100,7 @@ _mesa_vector4f_alloc( GLvector4f *v, GLbitfield flags, GLuint count,
 {
    v->stride = 4 * sizeof(GLfloat);
    v->size = 2;
-   v->storage = ALIGN_MALLOC( count * 4 * sizeof(GLfloat), alignment );
+   v->storage = _mesa_align_malloc( count * 4 * sizeof(GLfloat), alignment );
    v->storage_count = count;
    v->start = (GLfloat *) v->storage;
    v->data = (GLfloat (*)[4]) v->storage;
@@ -119,7 +118,7 @@ void
 _mesa_vector4f_free( GLvector4f *v )
 {
    if (v->flags & VEC_MALLOC) {
-      ALIGN_FREE( v->storage );
+      _mesa_align_free( v->storage );
       v->data = NULL;
       v->start = NULL;
       v->storage = NULL;