[Mesa-dev] [PATCH v2 01/11] util: Remove u_math from u_vector

[Lucas Stach]

Am Donnerstag, den 13.07.2017, 12:12 +0100 schrieb Daniel Stone:
> 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.
> 
> Signed-off-by: Daniel Stone <daniels at collabora.com>
> ---
>  src/util/u_vector.c | 3 +++
>  src/util/u_vector.h | 1 -
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> v2: Add u_math.h include for u_vector.c so we get power_of_two.
> 
> diff --git a/src/util/u_vector.c b/src/util/u_vector.c
> index 37c4245ebe..4dc7bc22b6 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>

I don't think we need the string.h include if we are going to include
u_math.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 c0e199cfa5..cd8a95dcbe 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 */