diff options
author | dougm <dougm@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-28 18:27:49 +0000 |
---|---|---|
committer | dougm <dougm@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-28 18:27:49 +0000 |
commit | a074fb1bb4e9de1078b1194ffe18e6d4273bf866 (patch) | |
tree | d5017fa34a4cd51b2b8fc153955b889c245670d6 /shmem | |
parent | fc5da149691b413c7a68cf3f889c04cdaa6324f9 (diff) | |
download | libapr-a074fb1bb4e9de1078b1194ffe18e6d4273bf866.tar.gz |
back out APR_ prefix for TRUE,FALSE
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59983 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
-rw-r--r-- | shmem/unix/mm/mm.h | 8 | ||||
-rw-r--r-- | shmem/unix/mm/mm_alloc.c | 4 | ||||
-rw-r--r-- | shmem/unix/mm/mm_core.c | 16 | ||||
-rw-r--r-- | shmem/unix/mm/mm_global.c | 10 |
4 files changed, 19 insertions, 19 deletions
diff --git a/shmem/unix/mm/mm.h b/shmem/unix/mm/mm.h index b925efe3b..3c029e630 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(APR_FALSE) -#define APR_FALSE 0 +#if !defined(FALSE) +#define FALSE 0 #endif -#if !defined(APR_TRUE) -#define APR_TRUE !APR_FALSE +#if !defined(TRUE) +#define TRUE !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 6add51c0c..049a4ab20 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 APR_FALSE; + return 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 APR_FALSE; + return FALSE; return mm_core_unlock((void *)mm); } diff --git a/shmem/unix/mm/mm_core.c b/shmem/unix/mm/mm_core.c index 4225cd035..37d938ea0 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 = APR_FALSE; + static int initialized = 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 = APR_TRUE; + initialized = TRUE; } return; } @@ -519,7 +519,7 @@ int mm_core_lock(const void *core, mm_lock_mode mode) int fdsem; if (core == NULL) - return APR_FALSE; + return 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 = APR_FALSE; + rc = FALSE; } else - rc = APR_TRUE; + rc = TRUE; return rc; } @@ -580,7 +580,7 @@ int mm_core_unlock(const void *core) int fdsem; if (core == NULL) - return APR_FALSE; + return 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 = APR_FALSE; + rc = FALSE; } else - rc = APR_TRUE; + rc = TRUE; return rc; } diff --git a/shmem/unix/mm/mm_global.c b/shmem/unix/mm/mm_global.c index c42415880..53efcca58 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 APR_FALSE; + return FALSE; if ((mm_global = mm_create(size, file)) == NULL) - return APR_FALSE; - return APR_TRUE; + return FALSE; + return 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 APR_FALSE; + return FALSE; return mm_lock(mm_global, mode); } int MM_unlock(void) { if (mm_global == NULL) - return APR_FALSE; + return FALSE; return mm_unlock(mm_global); } |