From ae0988fbfe4e64984568f2f0e4fb89cddfc4f63c Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Sat, 12 Nov 2022 19:37:04 +0100
Subject: [PATCH] Prevent double definition error when both OSDI and XSPICE are
 enabled.

---
 src/osdi/osdiregistry.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/osdi/osdiregistry.c b/src/osdi/osdiregistry.c
index 65f0aaca5..628afeebc 100644
--- a/src/osdi/osdiregistry.c
+++ b/src/osdi/osdiregistry.c
@@ -409,6 +409,7 @@ static const char errstr_fmt[] =
     "Unable to find message in dlerr(). System code = %lu";
 static char errstr[sizeof errstr_fmt - 3 + 3 * sizeof(unsigned long)];
 
+#if !defined (XSPICE)
 char *dlerror(void) {
   LPVOID lpMsgBuf;
 
@@ -425,6 +426,7 @@ char *dlerror(void) {
 
   return lpMsgBuf; /* Return the formatted message */
 } /* end of function dlerror */
+#endif
 
 /* Free message related to dynamic loading */
 static void free_dlerr_msg(char *msg) {