diff options
| author | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
| commit | 6c953d0bde107059db75d01cd30326a31cd0de54 (patch) | |
| tree | c41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/llcommon/llapr.h | |
| parent | bdd7bdf390775860fb26a6c7d0923f45bb20256c (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/llcommon/llapr.h')
| -rw-r--r-- | indra/llcommon/llapr.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index b1b0fc4718..1ac5c4e9b2 100644 --- a/indra/llcommon/llapr.h +++ b/indra/llcommon/llapr.h @@ -52,12 +52,11 @@ struct apr_dso_handle_t; * APR_SUCCESS. * @return Returns <code>true</code> if status is an error condition. */ -bool LL_COMMON_API ll_apr_warn_status(apr_status_t status); -/// There's a whole other APR error-message function if you pass a DSO handle. -bool LL_COMMON_API ll_apr_warn_status(apr_status_t status, apr_dso_handle_t* handle); +#define ll_apr_warn_status(status) _ll_apr_warn_status(status, __FILE__, __LINE__) +bool LL_COMMON_API _ll_apr_warn_status(apr_status_t status, const char* file, int line); -void LL_COMMON_API ll_apr_assert_status(apr_status_t status); -void LL_COMMON_API ll_apr_assert_status(apr_status_t status, apr_dso_handle_t* handle); +#define ll_apr_assert_status(status) _ll_apr_assert_status(status, __FILE__, __LINE__) +void LL_COMMON_API _ll_apr_assert_status(apr_status_t status, const char* file, int line); extern "C" LL_COMMON_API apr_pool_t* gAPRPoolp; // Global APR memory pool |