svn commit: r1920681 - in /apr/apr/branches/1.7.x: ./ include/apr.h.in

Author: covener
Date: Sun Sep 15 14:33:14 2024
New Revision: 1920681

URL: http://svn.apache.org/viewvc?rev=1920681&view=rev
Log:
Merge r1920680 from trunk:

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

since 1.7.5, on solaris with Oracle Developer Studio



Modified:
    apr/apr/branches/1.7.x/   (props changed)
    apr/apr/branches/1.7.x/include/apr.h.in

Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1920680

Modified: apr/apr/branches/1.7.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/include/apr.h.in?rev=1920681&r1=1920680&r2=1920681&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/include/apr.h.in (original)
+++ apr/apr/branches/1.7.x/include/apr.h.in Sun Sep 15 14:33:14 2024
@@ -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__ */