summaryrefslogtreecommitdiff
path: root/locks
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2010-03-07 14:44:29 +0000
committerGraham Leggett <minfrin@apache.org>2010-03-07 14:44:29 +0000
commit49d5172bed0d73ff69bd07d31d6da8bc4626da8c (patch)
tree0d464b162fbd5150602085f2402055114b5994ef /locks
parent6caff128ae82faf3f67a228e79c7557938811c61 (diff)
downloadapr-49d5172bed0d73ff69bd07d31d6da8bc4626da8c.tar.gz
Backport 917837:
Use the APR_FOPEN_* constants instead of the deprecated APR_* constants within code outside the file_io code. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@920002 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r--locks/unix/proc_mutex.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index 1d334425d..f9637e03f 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -547,14 +547,14 @@ static apr_status_t proc_mutex_fcntl_create(apr_proc_mutex_t *new_mutex,
if (fname) {
new_mutex->fname = apr_pstrdup(new_mutex->pool, fname);
rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
- APR_CREATE | APR_WRITE | APR_EXCL,
+ APR_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_EXCL,
APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD,
new_mutex->pool);
}
else {
new_mutex->fname = apr_pstrdup(new_mutex->pool, "/tmp/aprXXXXXX");
rv = apr_file_mktemp(&new_mutex->interproc, new_mutex->fname,
- APR_CREATE | APR_WRITE | APR_EXCL,
+ APR_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_EXCL,
new_mutex->pool);
}
@@ -667,14 +667,14 @@ static apr_status_t proc_mutex_flock_create(apr_proc_mutex_t *new_mutex,
if (fname) {
new_mutex->fname = apr_pstrdup(new_mutex->pool, fname);
rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
- APR_CREATE | APR_WRITE | APR_EXCL,
+ APR_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_EXCL,
APR_UREAD | APR_UWRITE,
new_mutex->pool);
}
else {
new_mutex->fname = apr_pstrdup(new_mutex->pool, "/tmp/aprXXXXXX");
rv = apr_file_mktemp(&new_mutex->interproc, new_mutex->fname,
- APR_CREATE | APR_WRITE | APR_EXCL,
+ APR_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_EXCL,
new_mutex->pool);
}
@@ -750,7 +750,7 @@ static apr_status_t proc_mutex_flock_child_init(apr_proc_mutex_t **mutex,
}
new_mutex->fname = apr_pstrdup(pool, fname);
rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
- APR_WRITE, 0, new_mutex->pool);
+ APR_FOPEN_WRITE, 0, new_mutex->pool);
if (rv != APR_SUCCESS) {
return rv;
}