[Mesa-dev] [PATCH 4/4] gallium/util: move u_string.h to src/util/u_string.h

[Timothy Arceri]

This will help use move u_queue.c here eventually and also provide
string function wrappers for anyone wishing to port disk_cache.c
to windows.
---
 src/gallium/auxiliary/Makefile.sources      | 1 -
 src/gallium/auxiliary/util/u_debug_symbol.c | 2 +-
 src/gallium/auxiliary/util/u_queue.c        | 2 +-
 src/util/Makefile.sources                   | 1 +
 src/{gallium/auxiliary => }/util/u_string.h | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{gallium/auxiliary => }/util/u_string.h (100%)

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 8d3e4a9..9063b51 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -283,21 +283,20 @@ C_SOURCES := \
 	util/u_resource.c \
 	util/u_resource.h \
 	util/u_ringbuffer.c \
 	util/u_ringbuffer.h \
 	util/u_sampler.c \
 	util/u_sampler.h \
 	util/u_simple_shaders.c \
 	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 \
 	util/u_surface.h \
 	util/u_surfaces.c \
 	util/u_surfaces.h \
 	util/u_tests.c \
 	util/u_tests.h \
 	util/u_texture.c \
 	util/u_texture.h \
diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c
index f0b0629..4b55523 100644
--- a/src/gallium/auxiliary/util/u_debug_symbol.c
+++ b/src/gallium/auxiliary/util/u_debug_symbol.c
@@ -27,21 +27,21 @@
 
 /**
  * @file
  * Symbol lookup.
  * 
  * @author Jose Fonseca <jfonseca at vmware.com>
  */
 
 #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"
 #include "u_hash_table.h"
 
 
 #if defined(PIPE_OS_WINDOWS)
    
 #include <windows.h>
 #include <stddef.h>
diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c
index bb63a6b..05ffc3e 100644
--- a/src/gallium/auxiliary/util/u_queue.c
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -19,21 +19,21 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
  */
 
 #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);
 
 /****************************************************************************
  * Wait for all queues to assert idle when exit() is called.
  *
  * Otherwise, C++ static variable destructors can be called while threads
  * are using the static variables.
  */
 
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 08ad7be..8b21702 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -37,17 +37,18 @@ MESA_UTIL_FILES :=	\
 	slab.h \
 	string_to_uint_map.h \
 	string_to_uint_map.cpp \
 	strndup.c \
 	strndup.h \
 	strtod.c \
 	strtod.h \
 	texcompress_rgtc_tmp.h \
 	u_atomic.h \
 	u_endian.h \
+	u_string.h \
 	u_vector.c \
 	u_vector.h \
 	vk_alloc.h \
 	vk_util.h
 
 MESA_UTIL_GENERATED_FILES = \
 	format_srgb.c
diff --git a/src/gallium/auxiliary/util/u_string.h b/src/util/u_string.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_string.h
rename to src/util/u_string.h
-- 
2.9.3