summaryrefslogtreecommitdiffstats
path: root/include/apr_general.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:59:59 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-12 04:59:59 +0000
commit052282b2d174632c62327a1ccd2d839e8ab3ec9e (patch)
tree9604f20f0dc601f1b8f34d0adbd9fcdc57140b2d /include/apr_general.h
parentReleasing progress-linux version 1.7.2-3.2~progress7.99u1. (diff)
downloadapr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.tar.xz
apr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.zip
Merging upstream version 1.7.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/apr_general.h')
-rw-r--r--include/apr_general.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/apr_general.h b/include/apr_general.h
index fa073c8..48d8b89 100644
--- a/include/apr_general.h
+++ b/include/apr_general.h
@@ -103,11 +103,18 @@ typedef int apr_signum_t;
* @param field data field within the structure
* @return offset
*/
+#if defined(__has_builtin)
+#if __has_builtin(__builtin_offsetof)
+#define APR_OFFSETOF(s_type,field) __builtin_offsetof(s_type,field)
+#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