From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 16 Nov 2018 21:51:49 +0000 (+0300)
Subject: Prevent config macros redefinition undefined in gcconfig.h
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a72365dad934afb78b1c670a8a86408aa8655b06;p=gc

Prevent config macros redefinition undefined in gcconfig.h
(fix of commit 4f837f7a7)

* include/private/gc_pmark.h [HAVE_CONFIG_H]: Do not include config.h
if GC_PRIVATE_H is defined; add comment.
---

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index 3bc34108..c301c4dd 100644
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -22,7 +22,9 @@
 #ifndef GC_PMARK_H
 #define GC_PMARK_H
 
-#ifdef HAVE_CONFIG_H
+#if defined(HAVE_CONFIG_H) && !defined(GC_PRIVATE_H)
+  /* When gc_pmark.h is included from gc_priv.h, some of macros might   */
+  /* be undefined in gcconfig.h, so skip config.h in this case.         */
 # include "config.h"
 #endif