apr_general: Follow up to r1916337: Work around some broken compilers.

Older gcc (e.g. 8.5.0 per Rüdiger) want two #ifs for:

#if defined(__has_builtin) && __has_builtin(__builtin_offsetof)

So be it..


Merges r1916385 from ^/apr/apr/trunk


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1916386 13f79535-47bb-0310-9956-ffa450edef68

include/apr_general.h

@@ -103,13 +103,18 @@ typedef int               apr_signum_t;
  * @param field  data field within the structure
  * @return offset
  */
-#if defined(__has_builtin) && __has_builtin(__builtin_offsetof)
+#if defined(__has_builtin)
+#if __has_builtin(__builtin_offsetof)
 #define APR_OFFSETOF(s_type,field) __builtin_offsetof(s_type,field)
-#elif defined(offsetof) && !defined(__cplusplus)
+#endif
+#endif /* __has_builtin */
+#ifndef APR_OFFSETOF
+#if defined(offsetof) && !defined(__cplusplus)
 #define APR_OFFSETOF(s_type,field) offsetof(s_type,field)
 #else
 #define APR_OFFSETOF(s_type,field) APR_OFFSET(s_type*,field)
 #endif
+#endif /* ndef APR_OFFSETOF */
 
 #ifndef DOXYGEN