From 6a2993b9493bff7b6b20858730cba16a218e46b1 Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Sun, 15 Sep 2024 14:33:14 +0000
Subject: [PATCH] Merge r1920680 from trunk:

PR69298:  "attribute "format" is unknown, ignored"

since 1.7.5, on solaris with Oracle Developer Studio




git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1920681 13f79535-47bb-0310-9956-ffa450edef68
---
 include/apr.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/apr.h.in b/include/apr.h.in
index c5bb22779d..637ed38771 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
@@ -68,7 +68,7 @@
  * necessarily __attribute__ (e.g. builtin), so check for both to
  * avoid overriding __attribute__.
  */
-#if !(defined(__attribute__) || defined(__has_attribute))
+#if !(defined(__attribute__) || defined(__has_attribute)) || defined(__SUNPRO_C)
 #define __attribute__(__x)
 #endif
 #endif /* !__GNUC__ */