From 127ecaf5f36385f241b4166a3ab0d80c303f2d63 Mon Sep 17 00:00:00 2001
From: ethbaat <jeno.balasko@ericsson.com>
Date: Wed, 13 Apr 2016 16:38:18 +0200
Subject: [PATCH] Solaris 10 x86 definition conflict. #undef ERR (req: Thomas
Herrlin)
Signed-off-by: ethbaat <jeno.balasko@ericsson.com>
---
common/config_preproc.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/config_preproc.cc b/common/config_preproc.cc
index d3a8a0b46..198d939fa 100644
--- a/common/config_preproc.cc
+++ b/common/config_preproc.cc
@@ -15,6 +15,10 @@
#include <stdio.h>
#include <stdlib.h>
+// Solaris 10 on x86 may define ERR in /usr/include/sys/regset.h depending on compiler and flags.
+// Workaround enum conflict with undef.
+#undef ERR
+
void string_chain_add(string_chain_t **ec, char *s)
{
string_chain_t *i = *ec, *new_ec;
--
GitLab