Mesa (main): util: fix u_print.cpp build on OpenBSD
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Feb 26 01:37:24 UTC 2022
Module: Mesa
Branch: main
Commit: 623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=623ff4ec4295dc67bc0c99ed5336eaae1ad76cc9
Author: Jonathan Gray <jsg at jsg.id.au>
Date: Wed Oct 20 11:50:57 2021 +1100
util: fix u_print.cpp build on OpenBSD
move include so va_list will be picked up via stdarg.h
In file included from ../src/util/u_printf.cpp:24:
../src/util/u_printf.h:43:41: error: unknown type name 'va_list'; did you mean '__va_list'?
size_t u_printf_length(const char *fmt, va_list untouched_args);
^~~~~~~
__va_list
/usr/include/machine/_types.h:126:27: note: '__va_list' declared here
typedef __builtin_va_list __va_list;
^
and add includes to u_printf.h as suggested by Ilia Mirkin
stdarg.h for va_list and stddef.h for size_t
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13448>
---
src/util/u_printf.cpp | 2 +-
src/util/u_printf.h | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/util/u_printf.cpp b/src/util/u_printf.cpp
index 81a8c148147..c23265fec96 100644
--- a/src/util/u_printf.cpp
+++ b/src/util/u_printf.cpp
@@ -21,9 +21,9 @@
//
// Extract from Serge's printf clover code by airlied.
-#include "u_printf.h"
#include <assert.h>
#include <stdarg.h>
+#include "u_printf.h"
#include "util/macros.h"
/* Some versions of MinGW are missing _vscprintf's declaration, although they
diff --git a/src/util/u_printf.h b/src/util/u_printf.h
index 44dcce5529f..d378b13f78f 100644
--- a/src/util/u_printf.h
+++ b/src/util/u_printf.h
@@ -22,6 +22,9 @@
#ifndef U_PRINTF_H
#define U_PRINTF_H
+#include <stdarg.h>
+#include <stddef.h>
+
#ifdef __cplusplus
#include <string>
More information about the mesa-commit
mailing list