summaryrefslogtreecommitdiff
path: root/shmem
diff options
context:
space:
mode:
authordougm <dougm@13f79535-47bb-0310-9956-ffa450edef68>2000-04-28 06:49:50 +0000
committerdougm <dougm@13f79535-47bb-0310-9956-ffa450edef68>2000-04-28 06:49:50 +0000
commit78c6a1d6c20932585e1cc3ba50f8d0304243b5f1 (patch)
treeb3a50a0c8fafae0f0e35cdf5dd92efa2f86d1a19 /shmem
parent41d63b37e07421c07743f617e2da0b8292c9e287 (diff)
downloadlibapr-78c6a1d6c20932585e1cc3ba50f8d0304243b5f1.tar.gz
prefix TRUE,FALSE with APR_
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59975 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
-rw-r--r--shmem/unix/mm/mm.h8
-rw-r--r--shmem/unix/mm/mm_alloc.c4
-rw-r--r--shmem/unix/mm/mm_core.c16
-rw-r--r--shmem/unix/mm/mm_global.c10
4 files changed, 19 insertions, 19 deletions
diff --git a/shmem/unix/mm/mm.h b/shmem/unix/mm/mm.h
index 3c029e630..b925efe3b 100644
--- a/shmem/unix/mm/mm.h
+++ b/shmem/unix/mm/mm.h
@@ -92,11 +92,11 @@ extern int flock(int, int);
extern char *strerror(int);
#endif
-#if !defined(FALSE)
-#define FALSE 0
+#if !defined(APR_FALSE)
+#define APR_FALSE 0
#endif
-#if !defined(TRUE)
-#define TRUE !FALSE
+#if !defined(APR_TRUE)
+#define APR_TRUE !APR_FALSE
#endif
#if !defined(NULL)
#define NULL (void *)0
diff --git a/shmem/unix/mm/mm_alloc.c b/shmem/unix/mm/mm_alloc.c
index 049a4ab20..6add51c0c 100644
--- a/shmem/unix/mm/mm_alloc.c
+++ b/shmem/unix/mm/mm_alloc.c
@@ -120,7 +120,7 @@ void mm_destroy(MM *mm)
int mm_lock(MM *mm, mm_lock_mode mode)
{
if (mm == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_core_lock((void *)mm, mode);
}
@@ -130,7 +130,7 @@ int mm_lock(MM *mm, mm_lock_mode mode)
int mm_unlock(MM *mm)
{
if (mm == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_core_unlock((void *)mm);
}
diff --git a/shmem/unix/mm/mm_core.c b/shmem/unix/mm/mm_core.c
index 37d938ea0..4225cd035 100644
--- a/shmem/unix/mm/mm_core.c
+++ b/shmem/unix/mm/mm_core.c
@@ -73,7 +73,7 @@ static size_t mm_core_mapoffset = 1024*1024*1; /* we share with other apps */
static void mm_core_init(void)
{
- static int initialized = FALSE;
+ static int initialized = APR_FALSE;
if (!initialized) {
#if defined(MM_SEMT_FCNTL)
mm_core_dolock_rd.l_whence = SEEK_SET; /* from current point */
@@ -103,7 +103,7 @@ static void mm_core_init(void)
mm_core_dounlock[0].sem_op = -1;
mm_core_dounlock[0].sem_flg = SEM_UNDO;
#endif
- initialized = TRUE;
+ initialized = APR_TRUE;
}
return;
}
@@ -519,7 +519,7 @@ int mm_core_lock(const void *core, mm_lock_mode mode)
int fdsem;
if (core == NULL)
- return FALSE;
+ return APR_FALSE;
mc = (mem_core *)((char *)core-SIZEOF_mem_core);
#if !defined(MM_SEMT_FLOCK)
fdsem = mc->mc_fdsem;
@@ -566,10 +566,10 @@ int mm_core_lock(const void *core, mm_lock_mode mode)
if (rc < 0) {
ERR(MM_ERR_CORE|MM_ERR_SYSTEM, "Failed to lock");
- rc = FALSE;
+ rc = APR_FALSE;
}
else
- rc = TRUE;
+ rc = APR_TRUE;
return rc;
}
@@ -580,7 +580,7 @@ int mm_core_unlock(const void *core)
int fdsem;
if (core == NULL)
- return FALSE;
+ return APR_FALSE;
mc = (mem_core *)((char *)core-SIZEOF_mem_core);
#if !defined(MM_SEMT_FLOCK)
fdsem = mc->mc_fdsem;
@@ -616,10 +616,10 @@ int mm_core_unlock(const void *core)
if (rc < 0) {
ERR(MM_ERR_CORE|MM_ERR_SYSTEM, "Failed to unlock");
- rc = FALSE;
+ rc = APR_FALSE;
}
else
- rc = TRUE;
+ rc = APR_TRUE;
return rc;
}
diff --git a/shmem/unix/mm/mm_global.c b/shmem/unix/mm/mm_global.c
index 53efcca58..c42415880 100644
--- a/shmem/unix/mm/mm_global.c
+++ b/shmem/unix/mm/mm_global.c
@@ -52,10 +52,10 @@ static MM *mm_global = NULL;
int MM_create(size_t size, const char *file)
{
if (mm_global != NULL)
- return FALSE;
+ return APR_FALSE;
if ((mm_global = mm_create(size, file)) == NULL)
- return FALSE;
- return TRUE;
+ return APR_FALSE;
+ return APR_TRUE;
}
int MM_permission(mode_t mode, uid_t owner, gid_t group)
@@ -77,14 +77,14 @@ void MM_destroy(void)
int MM_lock(mm_lock_mode mode)
{
if (mm_global == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_lock(mm_global, mode);
}
int MM_unlock(void)
{
if (mm_global == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_unlock(mm_global);
}