diff options
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug_symbol.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_queue.c | 2 | ||||
| -rw-r--r-- | src/util/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/util/u_string.h (renamed from src/gallium/auxiliary/util/u_string.h) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 8d3e4a95c66..9063b5134c3 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -290,7 +290,6 @@ C_SOURCES := \ util/u_simple_shaders.h \ util/u_split_prim.h \ util/u_sse.h \ - util/u_string.h \ util/u_suballoc.c \ util/u_suballoc.h \ util/u_surface.c \ diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c index f0b0629c8e8..4b555238644 100644 --- a/src/gallium/auxiliary/util/u_debug_symbol.c +++ b/src/gallium/auxiliary/util/u_debug_symbol.c @@ -34,7 +34,7 @@ #include "pipe/p_compiler.h" #include "os/os_thread.h" -#include "u_string.h" +#include "util/u_string.h" #include "u_debug.h" #include "u_debug_symbol.h" diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c index bb63a6ba081..05ffc3ef98c 100644 --- a/src/gallium/auxiliary/util/u_queue.c +++ b/src/gallium/auxiliary/util/u_queue.c @@ -26,7 +26,7 @@ #include "u_queue.h" #include "u_memory.h" -#include "u_string.h" +#include "util/u_string.h" static void util_queue_killall_and_wait(struct util_queue *queue); diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 08ad7bec3ab..8b2170292d7 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -44,6 +44,7 @@ MESA_UTIL_FILES := \ texcompress_rgtc_tmp.h \ u_atomic.h \ u_endian.h \ + u_string.h \ u_vector.c \ u_vector.h \ vk_alloc.h \ diff --git a/src/gallium/auxiliary/util/u_string.h b/src/util/u_string.h index e88e13f42c6..e88e13f42c6 100644 --- a/src/gallium/auxiliary/util/u_string.h +++ b/src/util/u_string.h |