[Mesa-dev] [PATCH mesa 10/13] util: use standard name for vasprintf()

[Eric Engestrom]

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
---
 src/gallium/auxiliary/util/u_async_debug.c | 2 +-
 src/gallium/auxiliary/util/u_log.c         | 2 +-
 src/util/u_string.h                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_async_debug.c b/src/gallium/auxiliary/util/u_async_debug.c
index 04faa6850e76da5d9dcf..d7aefbfe46bb4f612d1f 100644
--- a/src/gallium/auxiliary/util/u_async_debug.c
+++ b/src/gallium/auxiliary/util/u_async_debug.c
@@ -40,7 +40,7 @@ u_async_debug_message(void *data, unsigned *id, enum pipe_debug_type type,
    char *text;
    int r;
 
-   r = util_vasprintf(&text, fmt, args);
+   r = vasprintf(&text, fmt, args);
    if (r < 0)
       return;
 
diff --git a/src/gallium/auxiliary/util/u_log.c b/src/gallium/auxiliary/util/u_log.c
index dacbe0505e1ee3b75a7a..bf72fde3228d972e4d5f 100644
--- a/src/gallium/auxiliary/util/u_log.c
+++ b/src/gallium/auxiliary/util/u_log.c
@@ -130,7 +130,7 @@ u_log_printf(struct u_log_context *ctx, const char *fmt, ...)
    char *str = NULL;
 
    va_start(va, fmt);
-   int ret = util_vasprintf(&str, fmt, va);
+   int ret = vasprintf(&str, fmt, va);
    va_end(va);
 
    if (ret >= 0) {
diff --git a/src/util/u_string.h b/src/util/u_string.h
index a65867ad5fa0121ec54f..28035df44bf1e1ed4de5 100644
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -111,6 +111,7 @@ util_sprintf(char *str, const char *format, ...)
    va_end(ap);
 }
 
+#define vasprintf util_vasprintf
 static inline int
 util_vasprintf(char **ret, const char *format, va_list ap)
 {
@@ -214,7 +215,6 @@ util_strstr(const char *haystack, const char *needle)
 #define util_vsnprintf vsnprintf
 #define util_snprintf snprintf
 #define util_vsprintf vsprintf
-#define util_vasprintf vasprintf
 
 #endif
 
-- 
Cheers,
  Eric