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

24 files changed, 100 insertions, 100 deletions

diff --git a/file_io/beos/readwrite.c b/file_io/beos/readwrite.c
index 033c2bdab..96aaf5247 100644
--- a/file_io/beos/readwrite.c
+++ b/file_io/beos/readwrite.c
@@ -83,7 +83,7 @@ ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
             if (thefile->bufpos >= thefile->dataRead) {
                 thefile->dataRead = read(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE);
                 if (thefile->dataRead == 0) {
-                    thefile->eof_hit = APR_TRUE;
+                    thefile->eof_hit = TRUE;
                     break;
                 }
                 thefile->filePtr += thefile->dataRead;
@@ -219,7 +219,7 @@ ap_status_t ap_getc(char *ch, ap_file_t *thefile)
     }
     rv = read(thefile->filedes, ch, 1); 
     if (rv == 0) {
-        thefile->eof_hit = APR_TRUE;
+        thefile->eof_hit = TRUE;
         return APR_EOF;
     }
     else if (rv != 1) {
@@ -266,14 +266,14 @@ ap_status_t ap_flush(ap_file_t *thefile)
 ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
 {
     ssize_t rv;
-    int i, used_unget = APR_FALSE, beg_idx;
+    int i, used_unget = FALSE, beg_idx;
 
     if(len <= 1)  /* as per fgets() */
         return APR_SUCCESS;
 
     if(thefile->ungetchar != -1){
         str[0] = thefile->ungetchar;
-	used_unget = APR_TRUE;
+	used_unget = TRUE;
 	beg_idx = 1;
 	if(str[0] == '\n' || str[0] == '\r'){
 	    thefile->ungetchar = -1;
@@ -286,7 +286,7 @@ ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
     for (i = beg_idx; i < len; i++) {
         rv = read(thefile->filedes, &str[i], 1); 
         if (rv == 0) {
-            thefile->eof_hit = APR_TRUE;
+            thefile->eof_hit = TRUE;
 	    if(used_unget) thefile->filedes = -1;
 	    str[i] = '\0';
             return APR_EOF;
diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c
index a175dee5d..34f973ec6 100644
--- a/file_io/os2/dir.c
+++ b/file_io/os2/dir.c
@@ -82,7 +82,7 @@ ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cntxt)
         return APR_ENOMEM;
 
     thedir->handle = 0;
-    thedir->validentry = APR_FALSE;
+    thedir->validentry = FALSE;
     *new = thedir;
     ap_register_cleanup(cntxt, thedir, dir_cleanup, ap_null_cleanup);
     return APR_SUCCESS;
@@ -122,11 +122,11 @@ ap_status_t ap_readdir(ap_dir_t *thedir)
     }
 
     if (rv == 0 && entries == 1) {
-        thedir->validentry = APR_TRUE;
+        thedir->validentry = TRUE;
         return APR_SUCCESS;
     }
         
-    thedir->validentry = APR_FALSE;
+    thedir->validentry = FALSE;
     
     if (rv)
         return APR_OS2_STATUS(rv);
diff --git a/file_io/os2/open.c b/file_io/os2/open.c
index f24e50955..b65805c54 100644
--- a/file_io/os2/open.c
+++ b/file_io/os2/open.c
@@ -79,8 +79,8 @@ ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag,  ap_fil
 
     *new = dafile;
     dafile->cntxt = cntxt;
-    dafile->isopen = APR_FALSE;
-    dafile->eof_hit = APR_FALSE;
+    dafile->isopen = FALSE;
+    dafile->eof_hit = FALSE;
     dafile->buffer = NULL;
     dafile->flags = flag;
     
@@ -137,13 +137,13 @@ ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag,  ap_fil
     if (rv != 0)
         return APR_OS2_STATUS(rv);
     
-    dafile->isopen = APR_TRUE;
+    dafile->isopen = TRUE;
     dafile->fname = ap_pstrdup(cntxt, fname);
     dafile->filePtr = 0;
     dafile->bufpos = 0;
     dafile->dataRead = 0;
     dafile->direction = 0;
-    dafile->pipe = APR_FALSE;
+    dafile->pipe = FALSE;
 
     ap_register_cleanup(dafile->cntxt, dafile, apr_file_cleanup, ap_null_cleanup);
     return APR_SUCCESS;
@@ -161,7 +161,7 @@ ap_status_t ap_close(ap_file_t *file)
         rc = DosClose(file->filedes);
     
         if (rc == 0) {
-            file->isopen = APR_FALSE;
+            file->isopen = FALSE;
             status = APR_SUCCESS;
 
             if (file->flags & APR_DELONCLOSE) {
@@ -208,11 +208,11 @@ ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_pool_t *c
         (*file)->cntxt = cont;
     }
     (*file)->filedes = *dafile;
-    (*file)->isopen = APR_TRUE;
-    (*file)->buffered = APR_FALSE;
-    (*file)->eof_hit = APR_FALSE;
+    (*file)->isopen = TRUE;
+    (*file)->buffered = FALSE;
+    (*file)->eof_hit = FALSE;
     (*file)->flags = 0;
-    (*file)->pipe = APR_FALSE;
+    (*file)->pipe = FALSE;
     return APR_SUCCESS;
 }    
 
@@ -237,11 +237,11 @@ ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont)
     (*thefile)->cntxt = cont;
     (*thefile)->filedes = 2;
     (*thefile)->fname = NULL;
-    (*thefile)->isopen = APR_TRUE;
-    (*thefile)->buffered = APR_FALSE;
-    (*thefile)->eof_hit = APR_FALSE;
+    (*thefile)->isopen = TRUE;
+    (*thefile)->buffered = FALSE;
+    (*thefile)->eof_hit = FALSE;
     (*thefile)->flags = 0;
-    (*thefile)->pipe = APR_FALSE;
+    (*thefile)->pipe = FALSE;
 
     return APR_SUCCESS;
 }
diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c
index bf4779888..4ec94a889 100644
--- a/file_io/os2/pipe.c
+++ b/file_io/os2/pipe.c
@@ -91,7 +91,7 @@ ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
     }
 
     (*in) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t));
-    rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, APR_FALSE);
+    rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, FALSE);
 
     if (rc) {
         DosClose(filedes[0]);
@@ -111,8 +111,8 @@ ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
     (*in)->cntxt = cont;
     (*in)->filedes = filedes[0];
     (*in)->fname = ap_pstrdup(cont, pipename);
-    (*in)->isopen = APR_TRUE;
-    (*in)->buffered = APR_FALSE;
+    (*in)->isopen = TRUE;
+    (*in)->buffered = FALSE;
     (*in)->flags = 0;
     (*in)->pipe = 1;
     (*in)->timeout = -1;
@@ -122,8 +122,8 @@ ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
     (*out)->cntxt = cont;
     (*out)->filedes = filedes[1];
     (*out)->fname = ap_pstrdup(cont, pipename);
-    (*out)->isopen = APR_TRUE;
-    (*out)->buffered = APR_FALSE;
+    (*out)->isopen = TRUE;
+    (*out)->buffered = FALSE;
     (*out)->flags = 0;
     (*out)->pipe = 1;
     (*out)->timeout = -1;
diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index 19f97feb1..d63ae1813 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -91,7 +91,7 @@ ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
                 rc = DosRead(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE, &thefile->dataRead );
                 if (thefile->dataRead == 0) {
                     if (rc == 0)
-                        thefile->eof_hit = APR_TRUE;
+                        thefile->eof_hit = TRUE;
                     break;
                 }
                 thefile->filePtr += thefile->dataRead;
@@ -129,7 +129,7 @@ ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
         *nbytes = bytesread;
         
         if (bytesread == 0) {
-            thefile->eof_hit = APR_TRUE;
+            thefile->eof_hit = TRUE;
         }
 
         return APR_SUCCESS;
@@ -255,7 +255,7 @@ ap_status_t ap_getc(char *ch, ap_file_t *thefile)
     }
     
     if (bytesread == 0) {
-        thefile->eof_hit = APR_TRUE;
+        thefile->eof_hit = TRUE;
         return APR_EOF;
     }
     
diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c
index c47247980..5b0d1d6a6 100644
--- a/file_io/unix/readwrite.c
+++ b/file_io/unix/readwrite.c
@@ -121,7 +121,7 @@ ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
             if (thefile->bufpos >= thefile->dataRead) {
                 thefile->dataRead = read(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE);
                 if (thefile->dataRead == 0) {
-                    thefile->eof_hit = APR_TRUE;
+                    thefile->eof_hit = TRUE;
                     break;
                 }
                 thefile->filePtr += thefile->dataRead;
@@ -300,7 +300,7 @@ ap_status_t ap_getc(char *ch, ap_file_t *thefile)
     }
     rv = read(thefile->filedes, ch, 1); 
     if (rv == 0) {
-        thefile->eof_hit = APR_TRUE;
+        thefile->eof_hit = TRUE;
         return APR_EOF;
     }
     else if (rv != 1) {
@@ -347,14 +347,14 @@ ap_status_t ap_flush(ap_file_t *thefile)
 ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
 {
     ssize_t rv;
-    int i, used_unget = APR_FALSE, beg_idx;
+    int i, used_unget = FALSE, beg_idx;
 
     if(len <= 1)  /* as per fgets() */
         return APR_SUCCESS;
 
     if(thefile->ungetchar != -1){
         str[0] = thefile->ungetchar;
-	used_unget = APR_TRUE;
+	used_unget = TRUE;
 	beg_idx = 1;
 	if(str[0] == '\n' || str[0] == '\r'){
 	    thefile->ungetchar = -1;
@@ -367,7 +367,7 @@ ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
     for (i = beg_idx; i < len; i++) {
         rv = read(thefile->filedes, &str[i], 1); 
         if (rv == 0) {
-            thefile->eof_hit = APR_TRUE;
+            thefile->eof_hit = TRUE;
 	    if(used_unget) thefile->filedes = -1;
 	    str[i] = '\0';
             return APR_EOF;
diff --git a/file_io/win32/fileio.h b/file_io/win32/fileio.h
index 0d0a67dc5..974889dd0 100644
--- a/file_io/win32/fileio.h
+++ b/file_io/win32/fileio.h
@@ -92,7 +92,7 @@
  *                    ugly way windows deals with case in the filesystem.
  * append -- Windows doesn't support the append concept when opening files.
  *           APR needs to keep track of this, and always make sure we append
- *           correctly when writing to a file with this flag set APR_TRUE.
+ *           correctly when writing to a file with this flag set TRUE.
  */
 
 struct ap_file_t {
diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c
index 678a1e9f0..861f12b32 100644
--- a/file_io/win32/filestat.c
+++ b/file_io/win32/filestat.c
@@ -96,9 +96,9 @@ BOOLEAN is_exe(const char* fname, ap_pool_t *cont) {
 
     if (ext && (!strcasecmp(ext,".exe") || !strcasecmp(ext,".com") || 
                 !strcasecmp(ext,".bat") || !strcasecmp(ext,".cmd"))) {
-        return APR_TRUE;
+        return TRUE;
     }
-    return APR_FALSE;
+    return FALSE;
 }
 
 ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile)
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c
index 46e957f51..fb16769d8 100644
--- a/file_io/win32/readwrite.c
+++ b/file_io/win32/readwrite.c
@@ -174,7 +174,7 @@ ap_status_t ap_getc(char *ch, ap_file_t *thefile)
         return GetLastError();
     }
     if (bread == 0) {
-        thefile->eof_hit = APR_TRUE;
+        thefile->eof_hit = TRUE;
         return APR_EOF;
     }
     return APR_SUCCESS; 
@@ -200,7 +200,7 @@ ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
         }
     }
     if (bread == 0) {
-        thefile->eof_hit = APR_TRUE;
+        thefile->eof_hit = TRUE;
         return APR_EOF;
     }
     for (i=0; i<len; i++) {
diff --git a/include/apr_general.h b/include/apr_general.h
index 280116073..5e86b6bc5 100644
--- a/include/apr_general.h
+++ b/include/apr_general.h
@@ -72,8 +72,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define APR_TRUE 1
-#define APR_FALSE 0
+#define TRUE 1
+#define FALSE 0
 
 #define MAXIMUM_WAIT_OBJECTS 64
 
diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h
index 0d0a67dc5..974889dd0 100644
--- a/include/arch/win32/fileio.h
+++ b/include/arch/win32/fileio.h
@@ -92,7 +92,7 @@
  *                    ugly way windows deals with case in the filesystem.
  * append -- Windows doesn't support the append concept when opening files.
  *           APR needs to keep track of this, and always make sure we append
- *           correctly when writing to a file with this flag set APR_TRUE.
+ *           correctly when writing to a file with this flag set TRUE.
  */
 
 struct ap_file_t {
diff --git a/lib/apr_pools.c b/lib/apr_pools.c
index db1a6a402..0d853a730 100644
--- a/lib/apr_pools.c
+++ b/lib/apr_pools.c
@@ -872,7 +872,7 @@ API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode
     return NULL;
 }
 
-/* return APR_TRUE iff a is an ancestor of b
+/* return TRUE iff a is an ancestor of b
  * NULL is considered an ancestor of all pools
  */
 API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b)
diff --git a/lib/apr_snprintf.c b/lib/apr_snprintf.c
index d4e671c4a..c5ea415ec 100644
--- a/lib/apr_snprintf.c
+++ b/lib/apr_snprintf.c
@@ -82,11 +82,11 @@ typedef enum {
     NO = 0, YES = 1
 } boolean_e;
 
-#ifndef APR_FALSE
-#define APR_FALSE			0
+#ifndef FALSE
+#define FALSE			0
 #endif
-#ifndef APR_TRUE
-#define APR_TRUE			1
+#ifndef TRUE
+#define TRUE			1
 #endif
 #ifndef AP_LONGEST_LONG
 #define AP_LONGEST_LONG		long
@@ -352,8 +352,8 @@ static char *ap_gcvt(double number, int ndigit, char *buf, boolean_e altform)
  * Return value:
  *   - a pointer to a string containing the number (no sign)
  *   - len contains the length of the string
- *   - is_negative is set to APR_TRUE or APR_FALSE depending on the sign
- *     of the number (always set to APR_FALSE if is_unsigned is APR_TRUE)
+ *   - is_negative is set to TRUE or FALSE depending on the sign
+ *     of the number (always set to FALSE if is_unsigned is TRUE)
  *
  * The caller provides a buffer for the string: that is the buf_end argument
  * which is a pointer to the END of the buffer + 1 (i.e. if the buffer
@@ -372,7 +372,7 @@ static char *conv_10(register wide_int num, register bool_int is_unsigned,
 
     if (is_unsigned) {
 	magnitude = (u_wide_int) num;
-	*is_negative = APR_FALSE;
+	*is_negative = FALSE;
     }
     else {
 	*is_negative = (num < 0);
@@ -428,7 +428,7 @@ static char *conv_10_quad(widest_int num, register bool_int is_unsigned,
 
     if (is_unsigned) {
 	magnitude = (u_widest_int) num;
-	*is_negative = APR_FALSE;
+	*is_negative = FALSE;
     }
     else {
 	*is_negative = (num < 0);
@@ -475,13 +475,13 @@ static char *conv_in_addr(struct in_addr *ia, char *buf_end, int *len)
     bool_int is_negative;
     int sub_len;
 
-    p = conv_10((addr & 0x000000FF)      , APR_TRUE, &is_negative, p, &sub_len);
+    p = conv_10((addr & 0x000000FF)      , TRUE, &is_negative, p, &sub_len);
     *--p = '.';
-    p = conv_10((addr & 0x0000FF00) >>  8, APR_TRUE, &is_negative, p, &sub_len);
+    p = conv_10((addr & 0x0000FF00) >>  8, TRUE, &is_negative, p, &sub_len);
     *--p = '.';
-    p = conv_10((addr & 0x00FF0000) >> 16, APR_TRUE, &is_negative, p, &sub_len);
+    p = conv_10((addr & 0x00FF0000) >> 16, TRUE, &is_negative, p, &sub_len);
     *--p = '.';
-    p = conv_10((addr & 0xFF000000) >> 24, APR_TRUE, &is_negative, p, &sub_len);
+    p = conv_10((addr & 0xFF000000) >> 24, TRUE, &is_negative, p, &sub_len);
 
     *len = buf_end - p;
     return (p);
@@ -495,7 +495,7 @@ static char *conv_sockaddr_in(struct sockaddr_in *si, char *buf_end, int *len)
     bool_int is_negative;
     int sub_len;
 
-    p = conv_10(ntohs(si->sin_port), APR_TRUE, &is_negative, p, &sub_len);
+    p = conv_10(ntohs(si->sin_port), TRUE, &is_negative, p, &sub_len);
     *--p = ':';
     p = conv_in_addr(&si->sin_addr, p, &sub_len);
 
@@ -530,7 +530,7 @@ static char *conv_fp(register char format, register double num,
      */
     if (ap_isalpha(*p)) {
 	*len = strlen(strcpy(buf, p));
-	*is_negative = APR_FALSE;
+	*is_negative = FALSE;
 	return (buf);
     }
 
@@ -572,7 +572,7 @@ static char *conv_fp(register char format, register double num,
 	*s++ = format;		/* either e or E */
 	decimal_point--;
 	if (decimal_point != 0) {
-	    p = conv_10((wide_int) decimal_point, APR_FALSE, &exponent_is_negative,
+	    p = conv_10((wide_int) decimal_point, FALSE, &exponent_is_negative,
 			&temp[EXPONENT_LENGTH], &t_len);
 	    *s++ = exponent_is_negative ? '-' : '+';
 
diff --git a/locks/os2/locks.c b/locks/os2/locks.c
index f4620fac8..dc288b6c9 100644
--- a/locks/os2/locks.c
+++ b/locks/os2/locks.c
@@ -99,7 +99,7 @@ ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e
     else
         semname = ap_pstrcat(cont, "/SEM32/", fname, NULL);
 
-    rc = DosCreateMutexSem(semname, &(new->hMutex), scope == APR_CROSS_PROCESS ? DC_SEM_SHARED : 0, APR_FALSE);
+    rc = DosCreateMutexSem(semname, &(new->hMutex), scope == APR_CROSS_PROCESS ? DC_SEM_SHARED : 0, FALSE);
     *lock = new;
 
     if (!rc)
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index db1a6a402..0d853a730 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -872,7 +872,7 @@ API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode
     return NULL;
 }
 
-/* return APR_TRUE iff a is an ancestor of b
+/* return TRUE iff a is an ancestor of b
  * NULL is considered an ancestor of all pools
  */
 API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b)
diff --git a/misc/win32/names.c b/misc/win32/names.c
index 4999045e8..d831842c9 100644
--- a/misc/win32/names.c
+++ b/misc/win32/names.c
@@ -60,7 +60,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-/* Returns APR_TRUE if the input string is a string
+/* Returns TRUE if the input string is a string
  * of one or more '.' characters.
  */
 static BOOL OnlyDots(char *pString)
@@ -68,13 +68,13 @@ static BOOL OnlyDots(char *pString)
     char *c;
 
     if (*pString == '\0')
-        return APR_FALSE;
+        return FALSE;
 
     for (c = pString;*c;c++)
         if (*c != '.')
-            return APR_FALSE;
+            return FALSE;
 
-    return APR_TRUE;
+    return TRUE;
 }
 
 /* Accepts as input a pathname, and tries to match it to an 
@@ -88,8 +88,8 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont,
     char buf[HUGE_STRING_LEN];
     char *pInputName;
     char *p, *q;
-    BOOL bDone = APR_FALSE;
-    BOOL bFileExists = APR_TRUE;
+    BOOL bDone = FALSE;
+    BOOL bFileExists = TRUE;
     HANDLE hFind;
     WIN32_FIND_DATA wfd;
 
@@ -114,7 +114,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont,
 
         /* If all we have is a drive letter, then we are done */
         if (strlen(pInputName) == 2)
-            bDone = APR_TRUE;
+            bDone = TRUE;
     }
     
     q = p;
@@ -151,7 +151,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont,
             *p = '\0';
 
         if (strchr(q, '*') || strchr(q, '?'))
-            bFileExists = APR_FALSE;
+            bFileExists = FALSE;
 
         /* If the path exists so far, call FindFirstFile
          * again.  However, if this portion of the path contains
@@ -164,7 +164,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont,
             hFind = FindFirstFile(pInputName, &wfd);
             
             if (hFind == INVALID_HANDLE_VALUE) {
-                bFileExists = APR_FALSE;
+                bFileExists = FALSE;
             }
             else {
                 FindClose(hFind);
@@ -185,7 +185,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont,
             p = strchr(p, '\\');
         }
         else {
-            bDone = APR_TRUE;
+            bDone = TRUE;
         }
     }
     
diff --git a/misc/win32/start.c b/misc/win32/start.c
index e56172811..95fa14d96 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -100,11 +100,11 @@ ap_status_t ap_get_oslevel(ap_pool_t *cont, ap_oslevel_e *level)
 {
     static OSVERSIONINFO oslev;
     static unsigned int servpack = 0;
-    static BOOL first = APR_TRUE;
+    static BOOL first = TRUE;
     char *pservpack;
 
     if (first) {
-        first = APR_FALSE;
+        first = FALSE;
         oslev.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
         GetVersionEx(&oslev);
         if (oslev.dwPlatformId == VER_PLATFORM_WIN32_NT) {
diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c
index 5e6514392..737af928b 100644
--- a/network_io/os2/sockets.c
+++ b/network_io/os2/sockets.c
@@ -106,7 +106,7 @@ ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
         return APR_OS2_STATUS(sock_errno());
     }
     (*new)->timeout = -1;
-    (*new)->nonblock = APR_FALSE;
+    (*new)->nonblock = FALSE;
     ap_register_cleanup((*new)->cntxt, (void *)(*new), 
                         socket_cleanup, ap_null_cleanup);
     return APR_SUCCESS;
@@ -158,7 +158,7 @@ ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *con
     (*new)->local_addr = sock->local_addr;
     (*new)->addr_len = sizeof(struct sockaddr_in);
     (*new)->timeout = -1;
-    (*new)->nonblock = APR_FALSE;
+    (*new)->nonblock = FALSE;
 
     (*new)->socketdes = accept(sock->socketdes, (struct sockaddr *)(*new)->remote_addr,
                         &(*new)->addr_len);
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);
 }
 
diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c
index 726fbf5f0..6fc0f755a 100644
--- a/threadproc/os2/proc.c
+++ b/threadproc/os2/proc.c
@@ -88,7 +88,7 @@ ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
     (*new)->child_err = NULL;
     (*new)->currdir = NULL; 
     (*new)->cmdtype = APR_PROGRAM;
-    (*new)->detached = APR_FALSE;
+    (*new)->detached = FALSE;
     return APR_SUCCESS;
 }
 
@@ -177,13 +177,13 @@ ap_status_t ap_fork(ap_proc_t **proc, ap_pool_t *cont)
     } else if (pid == 0) {
         (*proc)->pid = pid;
         (*proc)->attr = NULL;
-        (*proc)->running = APR_TRUE;
+        (*proc)->running = TRUE;
         return APR_INCHILD;
     }
 
     (*proc)->pid = pid;
     (*proc)->attr = NULL;
-    (*proc)->running = APR_TRUE;
+    (*proc)->running = TRUE;
     return APR_INPARENT;
 }
 
@@ -226,7 +226,7 @@ ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
     char **newargs;
     char savedir[300];
     HFILE save_in, save_out, save_err, dup;
-    int criticalsection = APR_FALSE;
+    int criticalsection = FALSE;
     char *extension, *newprogname, *extra_arg = NULL, *cmdline, *cmdline_pos;
     char interpreter[1024];
     char error_object[260];
@@ -242,11 +242,11 @@ ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
     }
 
     (*new)->cntxt = cont;
-    (*new)->running = APR_FALSE;
+    (*new)->running = FALSE;
 
     /* Prevent other threads from running while these process-wide resources are modified */
     if (attr->child_in || attr->child_out || attr->child_err || attr->currdir) {
-        criticalsection = APR_TRUE;
+        criticalsection = TRUE;
         DosEnterCritSec();
     }
 
diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c
index a171cb447..b516a2cdc 100644
--- a/threadproc/win32/proc.c
+++ b/threadproc/win32/proc.c
@@ -82,7 +82,7 @@ ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
     (*new)->child_err = NULL;
     (*new)->currdir = NULL; 
     (*new)->cmdtype = APR_PROGRAM;
-    (*new)->detached = APR_TRUE;
+    (*new)->detached = TRUE;
 
     memset(&(*new)->si, 0, sizeof((*new)->si));