svn commit: r1936828 - in apr/apr-util/branches/1.6.x: . crypto

[email protected] Mon, 03 Aug 2026 13:45:25 -0000
Newsgroups gmane.comp.apache.apr.cvs
Message-ID <178576472531.1865265.18394358939993659229@svn03-he-fi>
Author: covener
Date: Mon Aug  3 13:45:25 2026
New Revision: 1936828

Log:
Merge r1936827 from aprutil 1.7.x:

hide __has_attribute on traditional xlc platforms

The backport of 1917748 omitted this in apr.h on purpose,
but this is a new/narrow usage and not in a header
where it would taint anyones use of __has_attribute.

Modified:
   apr/apr-util/branches/1.6.x/   (props changed)
   apr/apr-util/branches/1.6.x/crypto/   (props changed)
   apr/apr-util/branches/1.6.x/crypto/apr_passwd.c

Modified: apr/apr-util/branches/1.6.x/crypto/apr_passwd.c
==============================================================================
--- apr/apr-util/branches/1.6.x/crypto/apr_passwd.c	Mon Aug  3 13:44:19 2026	(r1936827)
+++ apr/apr-util/branches/1.6.x/crypto/apr_passwd.c	Mon Aug  3 13:45:25 2026	(r1936828)
@@ -64,6 +64,12 @@ static volatile const apr_uint32_t optbl
  * Paper:
  *   https://cr.yp.to/papers/cryptoint-20250424.pdf
  */
+#if (defined(__xlc__) && !defined(__GNUC__))
+#ifndef __has_attribute
+#define __has_attribute(__x)    0
+#endif
+#endif
+
 #if __has_attribute(always_inline)
 __attribute__((always_inline))
 #endif