From 208f27f9641a59863ce1f7d4992df77f7eb0ea9d Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Sat, 15 Jun 2024 19:13:08 +0200
Subject: [PATCH] include: Don't define ATTRIBUTE_UNUSED in public header

Stop polluting namespace with unprefixed names.
---
 example/gjobread.c          | 2 +-
 fuzz/fuzz.h                 | 6 ++++++
 include/libxml/xmlexports.h | 6 ------
 libxml.h                    | 6 ++++++
 runsuite.c                  | 2 +-
 runxmlconf.c                | 2 +-
 testModule.c                | 1 +
 testapi.c                   | 2 +-
 testlimits.c                | 1 +
 testparser.c                | 1 +
 testrecurse.c               | 2 +-
 11 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/example/gjobread.c b/example/gjobread.c
index 926cab07..f45a9b95 100644
--- a/example/gjobread.c
+++ b/example/gjobread.c
@@ -177,7 +177,7 @@ typedef struct gjob {
 
 
 static gJobPtr
-parseGjobFile(char *filename ATTRIBUTE_UNUSED) {
+parseGjobFile(char *filename) {
     xmlDocPtr doc;
     gJobPtr ret;
     jobPtr curjob;
diff --git a/fuzz/fuzz.h b/fuzz/fuzz.h
index 8c69790b..1a155cdd 100644
--- a/fuzz/fuzz.h
+++ b/fuzz/fuzz.h
@@ -15,6 +15,12 @@
 extern "C" {
 #endif
 
+#if __GNUC__ * 100 + __GNUC_MINOR__ >= 207
+  #define ATTRIBUTE_UNUSED __attribute__((unused))
+#else
+  #define ATTRIBUTE_UNUSED
+#endif
+
 #if defined(LIBXML_HTML_ENABLED)
   #define HAVE_HTML_FUZZER
 #endif
diff --git a/include/libxml/xmlexports.h b/include/libxml/xmlexports.h
index a7a045fd..14b398c5 100644
--- a/include/libxml/xmlexports.h
+++ b/include/libxml/xmlexports.h
@@ -41,12 +41,6 @@
  * Attributes
  */
 
-#if __GNUC__ * 100 + __GNUC_MINOR__ >= 207
-  #define ATTRIBUTE_UNUSED __attribute__((unused))
-#else
-  #define ATTRIBUTE_UNUSED
-#endif
-
 #if !defined(__clang__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)
   #define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
 #else
diff --git a/libxml.h b/libxml.h
index d94677b5..9fc5033f 100644
--- a/libxml.h
+++ b/libxml.h
@@ -47,6 +47,12 @@
   #define XML_HIDDEN
 #endif
 
+#if __GNUC__ * 100 + __GNUC_MINOR__ >= 207
+  #define ATTRIBUTE_UNUSED __attribute__((unused))
+#else
+  #define ATTRIBUTE_UNUSED
+#endif
+
 #if defined(__clang__) || \
     (defined(__GNUC__) && (__GNUC__ >= 8) && !defined(__EDG__))
   #define ATTRIBUTE_NO_SANITIZE(arg) __attribute__((no_sanitize(arg)))
diff --git a/runsuite.c b/runsuite.c
index 257b9210..2a126ff9 100644
--- a/runsuite.c
+++ b/runsuite.c
@@ -6,7 +6,7 @@
  * daniel@veillard.com
  */
 
-#include "config.h"
+#include "libxml.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/runxmlconf.c b/runxmlconf.c
index dfbbf6b7..dab65a4a 100644
--- a/runxmlconf.c
+++ b/runxmlconf.c
@@ -6,7 +6,7 @@
  * daniel@veillard.com
  */
 
-#include "config.h"
+#include "libxml.h"
 #include <stdio.h>
 #include <libxml/xmlversion.h>
 
diff --git a/testModule.c b/testModule.c
index 6aea44db..7f848661 100644
--- a/testModule.c
+++ b/testModule.c
@@ -6,6 +6,7 @@
  * joelwreed@comcast.net
  */
 
+#include "libxml.h"
 #include <stdio.h>
 #include <libxml/xmlversion.h>
 
diff --git a/testapi.c b/testapi.c
index 72a29597..f3fea39e 100644
--- a/testapi.c
+++ b/testapi.c
@@ -11,7 +11,7 @@
 /* Disable deprecation warnings */
 #define XML_DEPRECATED
 
-#include "config.h"
+#include "libxml.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/testlimits.c b/testlimits.c
index b61c42cf..d5459d4b 100644
--- a/testlimits.c
+++ b/testlimits.c
@@ -10,6 +10,7 @@
  * daniel@veillard.com
  */
 
+#include "libxml.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/testparser.c b/testparser.c
index d19e9ea5..6c51a2cf 100644
--- a/testparser.c
+++ b/testparser.c
@@ -4,6 +4,7 @@
  * See Copyright for the status of this software.
  */
 
+#include "libxml.h"
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
 #include <libxml/xmlwriter.h>
diff --git a/testrecurse.c b/testrecurse.c
index 5aa2449d..47392872 100644
--- a/testrecurse.c
+++ b/testrecurse.c
@@ -12,7 +12,7 @@
 
 #define XML_DEPRECATED_MEMBER
 
-#include "config.h"
+#include "libxml.h"
 #include <stdio.h>
 
 #include <stdlib.h>