[core] rename lib apr symbols to fspr

libs/apr/include/arch/unix/fspr_arch_dso.h

@@ -17,11 +17,11 @@
 #ifndef DSO_H
 #define DSO_H
 
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_dso.h"
-#include "apr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_pools.h"
+#include "fspr_dso.h"
+#include "fspr.h"
 
 #if APR_HAS_DSO
 
@@ -52,8 +52,8 @@
 #define DLSYM_NEEDS_UNDERSCORE
 #endif
 
-struct apr_dso_handle_t {
-    apr_pool_t    *pool;
+struct fspr_dso_handle_t {
+    fspr_pool_t    *pool;
     void          *handle;
     const char    *errormsg;
 };

libs/apr/include/arch/unix/fspr_arch_file_io.h

@@ -17,17 +17,17 @@
 #ifndef FILE_IO_H
 #define FILE_IO_H
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_tables.h"
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-#include "apr_lib.h"
-#include "apr_thread_mutex.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_tables.h"
+#include "fspr_file_io.h"
+#include "fspr_file_info.h"
+#include "fspr_errno.h"
+#include "fspr_lib.h"
+#include "fspr_thread_mutex.h"
 #ifndef WAITIO_USES_POLL
-#include "apr_poll.h"
+#include "fspr_poll.h"
 #endif
 
 /* System headers the file I/O library needs */
@@ -84,29 +84,29 @@
 
 #define APR_FILE_BUFSIZE 4096
 
-struct apr_file_t {
-    apr_pool_t *pool;
+struct fspr_file_t {
+    fspr_pool_t *pool;
     int filedes;
     char *fname;
-    apr_int32_t flags;
+    fspr_int32_t flags;
     int eof_hit;
     int is_pipe;
-    apr_interval_time_t timeout;
+    fspr_interval_time_t timeout;
     int buffered;
     enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
     int ungetchar;    /* Last char provided by an unget op. (-1 = no char)*/
 #ifndef WAITIO_USES_POLL
     /* if there is a timeout set, then this pollset is used */
-    apr_pollset_t *pollset;
+    fspr_pollset_t *pollset;
 #endif
     /* Stuff for buffered mode */
     char *buffer;
     int bufpos;               /* Read/Write position in buffer */
     unsigned long dataRead;   /* amount of valid data read into buffer */
     int direction;            /* buffer being used for 0 = read, 1 = write */
-    apr_off_t filePtr;        /* position in file of handle */
+    fspr_off_t filePtr;        /* position in file of handle */
 #if APR_HAS_THREADS
-    struct apr_thread_mutex_t *thlock;
+    struct fspr_thread_mutex_t *thlock;
 #endif
 };
 
@@ -121,17 +121,17 @@ typedef struct stat64 struct_stat;
 typedef struct stat struct_stat;
 #endif
 
-struct apr_dir_t {
-    apr_pool_t *pool;
+struct fspr_dir_t {
+    fspr_pool_t *pool;
     char *dirname;
     DIR *dirstruct;
     struct dirent *entry;
 };
 
-apr_status_t apr_unix_file_cleanup(void *);
+fspr_status_t fspr_unix_file_cleanup(void *);
 
-mode_t apr_unix_perms2mode(apr_fileperms_t perms);
-apr_fileperms_t apr_unix_mode2perms(mode_t mode);
+mode_t fspr_unix_perms2mode(fspr_fileperms_t perms);
+fspr_fileperms_t fspr_unix_mode2perms(mode_t mode);
 
 
 #endif  /* ! FILE_IO_H */

libs/apr/include/arch/unix/fspr_arch_global_mutex.h

@@ -17,19 +17,19 @@
 #ifndef GLOBAL_MUTEX_H
 #define GLOBAL_MUTEX_H
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_global_mutex.h"
-#include "apr_arch_proc_mutex.h"
-#include "apr_arch_thread_mutex.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_lib.h"
+#include "fspr_global_mutex.h"
+#include "fspr_arch_proc_mutex.h"
+#include "fspr_arch_thread_mutex.h"
 
-struct apr_global_mutex_t {
-    apr_pool_t *pool;
-    apr_proc_mutex_t *proc_mutex;
+struct fspr_global_mutex_t {
+    fspr_pool_t *pool;
+    fspr_proc_mutex_t *proc_mutex;
 #if APR_HAS_THREADS
-    apr_thread_mutex_t *thread_mutex;
+    fspr_thread_mutex_t *thread_mutex;
 #endif /* APR_HAS_THREADS */
 };
 

libs/apr/include/arch/unix/fspr_arch_inherit.h

@@ -17,32 +17,32 @@
 #ifndef INHERIT_H
 #define INHERIT_H
 
-#include "apr_inherit.h"
+#include "fspr_inherit.h"
 
 #define APR_INHERIT (1 << 24)    /* Must not conflict with other bits */
 
 #define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
-apr_status_t apr_##name##_inherit_set(apr_##name##_t *the##name)    \
+fspr_status_t fspr_##name##_inherit_set(fspr_##name##_t *the##name)    \
 {                                                                   \
     if (the##name->flag & APR_FILE_NOCLEANUP)                       \
         return APR_EINVAL;                                          \
     if (!(the##name->flag & APR_INHERIT)) {                         \
         the##name->flag |= APR_INHERIT;                             \
-        apr_pool_child_cleanup_set(the##name->pool,                 \
+        fspr_pool_child_cleanup_set(the##name->pool,                 \
                                    (void *)the##name,               \
-                                   cleanup, apr_pool_cleanup_null); \
+                                   cleanup, fspr_pool_cleanup_null); \
     }                                                               \
     return APR_SUCCESS;                                             \
 }
 
 #define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
-apr_status_t apr_##name##_inherit_unset(apr_##name##_t *the##name)  \
+fspr_status_t fspr_##name##_inherit_unset(fspr_##name##_t *the##name)  \
 {                                                                   \
     if (the##name->flag & APR_FILE_NOCLEANUP)                       \
         return APR_EINVAL;                                          \
     if (the##name->flag & APR_INHERIT) {                            \
         the##name->flag &= ~APR_INHERIT;                            \
-        apr_pool_child_cleanup_set(the##name->pool,                 \
+        fspr_pool_child_cleanup_set(the##name->pool,                 \
                                    (void *)the##name,               \
                                    cleanup, cleanup);               \
     }                                                               \

libs/apr/include/arch/unix/fspr_arch_internal_time.h

@@ -17,8 +17,8 @@
 #ifndef TIME_INTERNAL_H
 #define TIME_INTERNAL_H
 
-#include "apr.h"
+#include "fspr.h"
 
-void apr_unix_setup_time(void);
+void fspr_unix_setup_time(void);
 
 #endif  /* TIME_INTERNAL_H */

libs/apr/include/arch/unix/fspr_arch_misc.h

@@ -17,16 +17,16 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include "apr.h"
-#include "apr_portable.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_getopt.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
-#include "apr_getopt.h"
+#include "fspr.h"
+#include "fspr_portable.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_pools.h"
+#include "fspr_getopt.h"
+#include "fspr_thread_proc.h"
+#include "fspr_file_io.h"
+#include "fspr_errno.h"
+#include "fspr_getopt.h"
 
 #if APR_HAVE_STDIO_H
 #include <stdio.h>
@@ -49,13 +49,13 @@
 #include <kernel/OS.h>
 #endif
 
-struct apr_other_child_rec_t {
-    apr_pool_t *p;
-    struct apr_other_child_rec_t *next;
-    apr_proc_t *proc;
+struct fspr_other_child_rec_t {
+    fspr_pool_t *p;
+    struct fspr_other_child_rec_t *next;
+    fspr_proc_t *proc;
     void (*maintenance) (int, void *, int);
     void *data;
-    apr_os_file_t write_fd;
+    fspr_os_file_t write_fd;
 };
 
 #if defined(WIN32) || defined(NETWARE)

libs/apr/include/arch/unix/fspr_arch_networkio.h

@@ -17,14 +17,14 @@
 #ifndef NETWORK_IO_H
 #define NETWORK_IO_H
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_network_io.h"
+#include "fspr_errno.h"
+#include "fspr_general.h"
+#include "fspr_lib.h"
 #ifndef WAITIO_USES_POLL
-#include "apr_poll.h"
+#include "fspr_poll.h"
 #endif
 
 /* System headers the network I/O library needs */
@@ -100,37 +100,37 @@ struct sock_userdata_t {
     void *data;
 };
 
-struct apr_socket_t {
-    apr_pool_t *pool;
+struct fspr_socket_t {
+    fspr_pool_t *pool;
     int socketdes;
     int type;
     int protocol;
-    apr_sockaddr_t *local_addr;
-    apr_sockaddr_t *remote_addr;
-    apr_interval_time_t timeout; 
+    fspr_sockaddr_t *local_addr;
+    fspr_sockaddr_t *remote_addr;
+    fspr_interval_time_t timeout; 
 #ifndef HAVE_POLL
     int connected;
 #endif
     int local_port_unknown;
     int local_interface_unknown;
     int remote_addr_unknown;
-    apr_int32_t options;
-    apr_int32_t inherit;
+    fspr_int32_t options;
+    fspr_int32_t inherit;
     sock_userdata_t *userdata;
 #ifndef WAITIO_USES_POLL
     /* if there is a timeout set, then this pollset is used */
-    apr_pollset_t *pollset;
+    fspr_pollset_t *pollset;
 #endif
 };
 
-const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size);
-int apr_inet_pton(int af, const char *src, void *dst);
-void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
+const char *fspr_inet_ntop(int af, const void *src, char *dst, fspr_size_t size);
+int fspr_inet_pton(int af, const char *src, void *dst);
+void fspr_sockaddr_vars_set(fspr_sockaddr_t *, int, fspr_port_t);
 
-#define apr_is_option_set(skt, option)  \
+#define fspr_is_option_set(skt, option)  \
     (((skt)->options & (option)) == (option))
 
-#define apr_set_option(skt, option, on) \
+#define fspr_set_option(skt, option, on) \
     do {                                 \
         if (on)                          \
             (skt)->options |= (option);         \

libs/apr/include/arch/unix/fspr_arch_poll_private.h

@@ -17,12 +17,12 @@
 #ifndef APR_ARCH_POLL_PRIVATE_H
 #define APR_ARCH_POLL_PRIVATE_H
 
-#include "apr.h"
-#include "apr_poll.h"
-#include "apr_time.h"
-#include "apr_portable.h"
-#include "apr_arch_networkio.h"
-#include "apr_arch_file_io.h"
+#include "fspr.h"
+#include "fspr_poll.h"
+#include "fspr_time.h"
+#include "fspr_portable.h"
+#include "fspr_arch_networkio.h"
+#include "fspr_arch_file_io.h"
 
 #if HAVE_POLL_H
 #include <poll.h>
@@ -52,7 +52,7 @@
 #define HAS_PIPES(dt) (dt == APR_POLL_FILE) ? 1 : 0
 #endif
 
-/* Choose the best method platform specific to use in apr_pollset */
+/* Choose the best method platform specific to use in fspr_pollset */
 #ifdef HAVE_KQUEUE
 #define POLLSET_USES_KQUEUE
 #elif defined(HAVE_PORT_CREATE)
@@ -73,16 +73,16 @@
 
 #if defined(POLLSET_USES_KQUEUE) || defined(POLLSET_USES_EPOLL) || defined(POLLSET_USES_PORT)
 
-#include "apr_ring.h"
+#include "fspr_ring.h"
 
 #if APR_HAS_THREADS
-#include "apr_thread_mutex.h"
+#include "fspr_thread_mutex.h"
 #define pollset_lock_rings() \
     if (pollset->flags & APR_POLLSET_THREADSAFE) \
-        apr_thread_mutex_lock(pollset->ring_lock);
+        fspr_thread_mutex_lock(pollset->ring_lock);
 #define pollset_unlock_rings() \
     if (pollset->flags & APR_POLLSET_THREADSAFE) \
-        apr_thread_mutex_unlock(pollset->ring_lock);
+        fspr_thread_mutex_unlock(pollset->ring_lock);
 #else
 #define pollset_lock_rings()
 #define pollset_unlock_rings()
@@ -92,7 +92,7 @@ typedef struct pfd_elem_t pfd_elem_t;
 
 struct pfd_elem_t {
     APR_RING_ENTRY(pfd_elem_t) link;
-    apr_pollfd_t pfd;
+    fspr_pollfd_t pfd;
 };
 
 #endif

libs/apr/include/arch/unix/fspr_arch_proc_mutex.h

@@ -23,15 +23,15 @@
 #endif
 #endif
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_proc_mutex.h"
-#include "apr_pools.h"
-#include "apr_portable.h"
-#include "apr_file_io.h"
-#include "apr_arch_file_io.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_lib.h"
+#include "fspr_proc_mutex.h"
+#include "fspr_pools.h"
+#include "fspr_portable.h"
+#include "fspr_file_io.h"
+#include "fspr_arch_file_io.h"
 
 /* System headers required by Locks library */
 #if APR_HAVE_SYS_TYPES_H
@@ -73,19 +73,19 @@
 #endif
 /* End System Headers */
 
-struct apr_proc_mutex_unix_lock_methods_t {
+struct fspr_proc_mutex_unix_lock_methods_t {
     unsigned int flags;
-    apr_status_t (*create)(apr_proc_mutex_t *, const char *);
-    apr_status_t (*acquire)(apr_proc_mutex_t *);
-    apr_status_t (*tryacquire)(apr_proc_mutex_t *);
-    apr_status_t (*release)(apr_proc_mutex_t *);
-    apr_status_t (*cleanup)(void *);
-    apr_status_t (*child_init)(apr_proc_mutex_t **, apr_pool_t *, const char *);
+    fspr_status_t (*create)(fspr_proc_mutex_t *, const char *);
+    fspr_status_t (*acquire)(fspr_proc_mutex_t *);
+    fspr_status_t (*tryacquire)(fspr_proc_mutex_t *);
+    fspr_status_t (*release)(fspr_proc_mutex_t *);
+    fspr_status_t (*cleanup)(void *);
+    fspr_status_t (*child_init)(fspr_proc_mutex_t **, fspr_pool_t *, const char *);
     const char *name;
 };
-typedef struct apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_lock_methods_t;
+typedef struct fspr_proc_mutex_unix_lock_methods_t fspr_proc_mutex_unix_lock_methods_t;
 
-/* bit values for flags field in apr_unix_lock_methods_t */
+/* bit values for flags field in fspr_unix_lock_methods_t */
 #define APR_PROCESS_LOCK_MECH_IS_GLOBAL          1
 
 #if !APR_HAVE_UNION_SEMUN && defined(APR_HAS_SYSVSEM_SERIALIZE)
@@ -96,14 +96,14 @@ union semun {
 };
 #endif
 
-struct apr_proc_mutex_t {
-    apr_pool_t *pool;
-    const apr_proc_mutex_unix_lock_methods_t *meth;
-    const apr_proc_mutex_unix_lock_methods_t *inter_meth;
+struct fspr_proc_mutex_t {
+    fspr_pool_t *pool;
+    const fspr_proc_mutex_unix_lock_methods_t *meth;
+    const fspr_proc_mutex_unix_lock_methods_t *inter_meth;
     int curr_locked;
     char *fname;
 #if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
-    apr_file_t *interproc;
+    fspr_file_t *interproc;
 #endif
 #if APR_HAS_POSIXSEM_SERIALIZE
     sem_t *psem_interproc;
@@ -113,7 +113,7 @@ struct apr_proc_mutex_t {
 #endif
 };
 
-void apr_proc_mutex_unix_setup_lock(void);
+void fspr_proc_mutex_unix_setup_lock(void);
 
 #endif  /* PROC_MUTEX_H */
 

libs/apr/include/arch/unix/fspr_arch_shm.h

@@ -17,15 +17,15 @@
 #ifndef SHM_H
 #define SHM_H
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_shm.h"
-#include "apr_pools.h"
-#include "apr_file_io.h"
-#include "apr_network_io.h"
-#include "apr_portable.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_lib.h"
+#include "fspr_shm.h"
+#include "fspr_pools.h"
+#include "fspr_file_io.h"
+#include "fspr_network_io.h"
+#include "fspr_portable.h"
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
@@ -55,12 +55,12 @@
 #define MAP_FAILED ((void *)-1)
 #endif
 
-struct apr_shm_t {
-    apr_pool_t *pool;
+struct fspr_shm_t {
+    fspr_pool_t *pool;
     void *base;          /* base real address */
     void *usable;        /* base usable address */
-    apr_size_t reqsize;  /* requested segment size */
-    apr_size_t realsize; /* actual segment size */
+    fspr_size_t reqsize;  /* requested segment size */
+    fspr_size_t realsize; /* actual segment size */
     const char *filename;      /* NULL if anonymous */
 #if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON
     int shmid;          /* shmem ID returned from shmget() */

libs/apr/include/arch/unix/fspr_arch_thread_cond.h

@@ -17,13 +17,13 @@
 #ifndef THREAD_COND_H
 #define THREAD_COND_H
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_thread_mutex.h"
-#include "apr_thread_cond.h"
-#include "apr_pools.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_lib.h"
+#include "fspr_thread_mutex.h"
+#include "fspr_thread_cond.h"
+#include "fspr_pools.h"
 
 #if APR_HAVE_PTHREAD_H
 #include <pthread.h>
@@ -32,8 +32,8 @@
 /* XXX: Should we have a better autoconf search, something like
  * APR_HAS_PTHREAD_COND? -aaron */
 #if APR_HAS_THREADS
-struct apr_thread_cond_t {
-    apr_pool_t *pool;
+struct fspr_thread_cond_t {
+    fspr_pool_t *pool;
     pthread_cond_t cond;
 };
 #endif

libs/apr/include/arch/unix/fspr_arch_thread_mutex.h

@@ -23,20 +23,20 @@
 #endif
 #endif
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_thread_mutex.h"
-#include "apr_portable.h"
-#include "apr_atomic.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_thread_mutex.h"
+#include "fspr_portable.h"
+#include "fspr_atomic.h"
 
 #if APR_HAVE_PTHREAD_H
 #include <pthread.h>
 #endif
 
 #if APR_HAS_THREADS
-struct apr_thread_mutex_t {
-    apr_pool_t *pool;
+struct fspr_thread_mutex_t {
+    fspr_pool_t *pool;
     pthread_mutex_t mutex;
 };
 #endif

libs/apr/include/arch/unix/fspr_arch_thread_rwlock.h

@@ -17,11 +17,11 @@
 #ifndef THREAD_RWLOCK_H
 #define THREAD_RWLOCK_H
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_thread_rwlock.h"
-#include "apr_pools.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_general.h"
+#include "fspr_thread_rwlock.h"
+#include "fspr_pools.h"
 
 #if APR_HAVE_PTHREAD_H
 /* this gives us pthread_rwlock_t */
@@ -31,15 +31,15 @@
 #if APR_HAS_THREADS
 #ifdef HAVE_PTHREAD_RWLOCKS
 
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
+struct fspr_thread_rwlock_t {
+    fspr_pool_t *pool;
     pthread_rwlock_t rwlock;
 };
 
 #else
 
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
+struct fspr_thread_rwlock_t {
+    fspr_pool_t *pool;
 };
 #endif
 

libs/apr/include/arch/unix/fspr_arch_threadproc.h

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_arch_file_io.h"
+#include "fspr.h"
+#include "fspr_private.h"
+#include "fspr_thread_proc.h"
+#include "fspr_file_io.h"
+#include "fspr_arch_file_io.h"
 
 /* System headers required for thread/process library */
 #if APR_HAVE_PTHREAD_H
@@ -49,43 +49,43 @@
 
 #if APR_HAS_THREADS
 
-struct apr_thread_t {
-    apr_pool_t *pool;
+struct fspr_thread_t {
+    fspr_pool_t *pool;
     pthread_t *td;
     void *data;
-    apr_thread_start_t func;
-    apr_status_t exitval;
+    fspr_thread_start_t func;
+    fspr_status_t exitval;
 	int priority;
 };
 
-struct apr_threadattr_t {
-    apr_pool_t *pool;
+struct fspr_threadattr_t {
+    fspr_pool_t *pool;
     pthread_attr_t attr;
 	int priority;
 };
 
-struct apr_threadkey_t {
-    apr_pool_t *pool;
+struct fspr_threadkey_t {
+    fspr_pool_t *pool;
     pthread_key_t key;
 };
 
-struct apr_thread_once_t {
+struct fspr_thread_once_t {
     pthread_once_t once;
 };
 
 #endif
 
-struct apr_procattr_t {
-    apr_pool_t *pool;
-    apr_file_t *parent_in;
-    apr_file_t *child_in;
-    apr_file_t *parent_out;
-    apr_file_t *child_out;
-    apr_file_t *parent_err;
-    apr_file_t *child_err;
+struct fspr_procattr_t {
+    fspr_pool_t *pool;
+    fspr_file_t *parent_in;
+    fspr_file_t *child_in;
+    fspr_file_t *parent_out;
+    fspr_file_t *child_out;
+    fspr_file_t *parent_err;
+    fspr_file_t *child_err;
     char *currdir;
-    apr_int32_t cmdtype;
-    apr_int32_t detached;
+    fspr_int32_t cmdtype;
+    fspr_int32_t detached;
 #ifdef RLIMIT_CPU
     struct rlimit *limit_cpu;
 #endif
@@ -98,10 +98,10 @@ struct apr_procattr_t {
 #ifdef RLIMIT_NOFILE
     struct rlimit *limit_nofile;
 #endif
-    apr_child_errfn_t *errfn;
-    apr_int32_t errchk;
-    apr_uid_t   uid;
-    apr_gid_t   gid;
+    fspr_child_errfn_t *errfn;
+    fspr_int32_t errchk;
+    fspr_uid_t   uid;
+    fspr_gid_t   gid;
 };
 
 #endif  /* ! THREAD_PROC_H */