From a254325564b935f14253ab8b1aed1e25fc5f1701 Mon Sep 17 00:00:00 2001 From: Drake Arconis <drake@alchemyviewer.org> Date: Tue, 28 Oct 2014 23:04:36 -0400 Subject: [PATCH] changed: Clean up a little deprecated apr definition usage --- indra/llcommon/llapr.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index 8c3ea39db9..5a54db6f35 100755 --- a/indra/llcommon/llapr.h +++ b/indra/llcommon/llapr.h @@ -128,14 +128,14 @@ private: // File IO convenience functions. // Returns NULL if the file fails to open, sets *sizep to file size if not NULL // abbreviated flags -#define LL_APR_R (APR_READ) // "r" -#define LL_APR_W (APR_CREATE|APR_TRUNCATE|APR_WRITE) // "w" -#define LL_APR_A (APR_CREATE|APR_WRITE|APR_APPEND) // "w" -#define LL_APR_RB (APR_READ|APR_BINARY) // "rb" -#define LL_APR_WB (APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY) // "wb" -#define LL_APR_AB (APR_CREATE|APR_WRITE|APR_BINARY|APR_APPEND) -#define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b" -#define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b" +#define LL_APR_R (APR_FOPEN_READ) // "r" +#define LL_APR_W (APR_FOPEN_CREATE|APR_FOPEN_TRUNCATE|APR_FOPEN_WRITE) // "w" +#define LL_APR_A (APR_FOPEN_CREATE|APR_FOPEN_WRITE|APR_FOPEN_APPEND) // "w" +#define LL_APR_RB (APR_FOPEN_READ|APR_FOPEN_BINARY) // "rb" +#define LL_APR_WB (APR_FOPEN_CREATE|APR_FOPEN_TRUNCATE|APR_FOPEN_WRITE|APR_FOPEN_BINARY) // "wb" +#define LL_APR_AB (APR_FOPEN_CREATE|APR_FOPEN_WRITE|APR_FOPEN_BINARY|APR_FOPEN_APPEND) +#define LL_APR_RPB (APR_FOPEN_READ|APR_FOPEN_WRITE|APR_FOPEN_BINARY) // "r+b" +#define LL_APR_WPB (APR_FOPEN_CREATE|APR_FOPEN_TRUNCATE|APR_FOPEN_READ|APR_FOPEN_WRITE|APR_FOPEN_BINARY) // "w+b" // //apr_file manager -- GitLab