36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 5f499208cf53ebd3f05525918c213a36c3ca13b5 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Tue, 2 Mar 2021 10:42:49 +0000
|
|
Subject: [PATCH] builder: Don't redefine Val_none (OCaml 4.12).
|
|
|
|
CC virt_builder-setlocale-c.o
|
|
setlocale-c.c:38: error: "Val_none" redefined [-Werror]
|
|
38 | #define Val_none (Val_int (0))
|
|
|
|
|
In file included from /usr/lib64/ocaml/caml/alloc.h:24,
|
|
from setlocale-c.c:23:
|
|
/usr/lib64/ocaml/caml/mlvalues.h:395: note: this is the location of the previous definition
|
|
395 | #define Val_none Val_int(0)
|
|
|
|
|
---
|
|
builder/setlocale-c.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/builder/setlocale-c.c b/builder/setlocale-c.c
|
|
index 6d877e7ac..1834c11df 100644
|
|
--- a/builder/setlocale-c.c
|
|
+++ b/builder/setlocale-c.c
|
|
@@ -35,7 +35,9 @@ static const int lc_string_table[7] = {
|
|
LC_MESSAGES
|
|
};
|
|
|
|
+#ifndef Val_none
|
|
#define Val_none (Val_int (0))
|
|
+#endif
|
|
|
|
extern value virt_builder_setlocale (value val_category, value val_name);
|
|
|
|
--
|
|
2.29.0.rc2
|
|
|