summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/apr_strings.h6
-rw-r--r--include/apr_tables.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/include/apr_strings.h b/include/apr_strings.h
index 996f8ceb5..019017a1d 100644
--- a/include/apr_strings.h
+++ b/include/apr_strings.h
@@ -136,7 +136,11 @@ APR_DECLARE(void *) apr_pmemdup(apr_pool_t *p, const void *m, apr_size_t n);
* @param ... The strings to concatenate. The final string must be NULL
* @return The new string
*/
-APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...);
+APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...)
+#if defined(__GNUC__) && __GNUC__ >= 4
+ __attribute__((sentinel))
+#endif
+ ;
/**
* Concatenate multiple strings specified in a writev-style vector
diff --git a/include/apr_tables.h b/include/apr_tables.h
index c2cd74138..aef5c7ba8 100644
--- a/include/apr_tables.h
+++ b/include/apr_tables.h
@@ -380,7 +380,11 @@ typedef int (apr_table_do_callback_fn_t)(void *rec, const char *key,
* @see apr_table_do_callback_fn_t
*/
APR_DECLARE_NONSTD(int) apr_table_do(apr_table_do_callback_fn_t *comp,
- void *rec, const apr_table_t *t, ...);
+ void *rec, const apr_table_t *t, ...)
+#if defined(__GNUC__) && __GNUC__ >= 4
+ __attribute__((sentinel))
+#endif
+ ;
/**
* Iterate over a table running the provided function once for every