rbb 99/05/21 06:02:34
Modified: apr Makefile.in
apr/file_io/unix filedup.c
apr/locks/unix crossproc.c intraproc.c locks.c locks.h
apr/test ab_apr.c
apr/threadproc/unix threadproc.h
include apr_thread_proc.h
Log:
General cleanup.
Revision Changes Path
1.7 +1 -1 apache-apr/apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 1999/05/16 13:29:13 1.6
+++ Makefile.in 1999/05/21 13:02:27 1.7
@@ -55,7 +55,7 @@
subdirs_clean:
@for i in $(SUBDIRS); do \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) ) \
+ ( cd $$i && $(MAKE) clean ) \
done;
# DO NOT REMOVE
1.9 +1 -1 apache-apr/apr/file_io/unix/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/unix/filedup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- filedup.c 1999/05/12 18:03:12 1.8
+++ filedup.c 1999/05/21 13:02:28 1.9
@@ -56,7 +56,7 @@
#include "fileio.h"
#include "apr_file_io.h"
#include "apr_general.h"
-#include <strings.h>
+#include <string.h>
struct file_t *ap_dupfile(ap_context_t *cont, struct file_t *old_file)
{
1.3 +0 -1 apache-apr/apr/locks/unix/crossproc.c
Index: crossproc.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/unix/crossproc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crossproc.c 1999/05/17 13:11:49 1.2
+++ crossproc.c 1999/05/21 13:02:29 1.3
@@ -56,7 +56,6 @@
#include "apr_lock.h"
#include "apr_general.h"
#include "locks.h"
-#include <fcntlbits.h>
#include <unistd.h>
#include <sys/mman.h>
1.3 +0 -1 apache-apr/apr/locks/unix/intraproc.c
Index: intraproc.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/unix/intraproc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intraproc.c 1999/05/17 13:11:49 1.2
+++ intraproc.c 1999/05/21 13:02:30 1.3
@@ -56,7 +56,6 @@
#include "apr_lock.h"
#include "apr_general.h"
#include "locks.h"
-#include <fcntlbits.h>
#if defined (USE_PTHREAD_SERIALIZE)
1.3 +1 -1 apache-apr/apr/locks/unix/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/unix/locks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locks.c 1999/05/17 13:11:49 1.2
+++ locks.c 1999/05/21 13:02:30 1.3
@@ -55,7 +55,7 @@
#include "apr_general.h"
#include "locks.h"
-#include <strings.h>
+#include <string.h>
struct lock_t *ap_create_lock(ap_context_t *cont, ap_locktype_e type, char
*fname)
{
1.4 +3 -2 apache-apr/apr/locks/unix/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/unix/locks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locks.h 1999/05/17 13:11:49 1.3
+++ locks.h 1999/05/21 13:02:31 1.4
@@ -65,9 +65,10 @@
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>
-#endif
-#include <fcntlbits.h>
+#elif defined (USE_FLOCK_SERIALIZE) || (USE_FCNTL_SERIALIZE)
+#include <sys/file.h>
#include <stdio.h>
+#endif
#include <pthread.h>
#ifdef NEED_UNION_SEMUN
1.9 +1 -11 apache-apr/apr/test/ab_apr.c
Index: ab_apr.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/test/ab_apr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ab_apr.c 1999/05/20 18:01:41 1.8
+++ ab_apr.c 1999/05/21 13:02:32 1.9
@@ -105,18 +105,9 @@
#include "apr_network_io.h"
#include "apr_file_io.h"
-
#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-/*#include <netinet/in.h> */
-#include <netdb.h>
-#include <sys/ioctl.h>
#include <string.h>
-
+#include <stdio.h>
/* ------------------- DEFINITIONS -------------------------- */
@@ -863,7 +854,6 @@
{
ap_file_t *postfd;
int status;
- struct stat postfilestat;
ap_fileperms_t mode;
if ((postfd = ap_open(cntxt, pfile, APR_READ, mode)) == NULL) {
1.5 +0 -6 apache-apr/apr/threadproc/unix/threadproc.h
Index: threadproc.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/threadproc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- threadproc.h 1999/05/12 20:04:26 1.4
+++ threadproc.h 1999/05/21 13:02:33 1.5
@@ -62,12 +62,6 @@
#define SHELL_PATH "/bin/sh"
-#define PTHREAD_CANCEL_AYNCHRONOUS CANCEL_ASYNCH;
-#define PTHREAD_CANCEL_DEFERRED CANCEL_DEFER;
-
-#define PTHREAD_CANCEL_ENABLE CANCEL_ENABLE;
-#define PTHREAD_CANCEL_DISABLE CANCEL_DISABLE;
-
struct thread_t {
pthread_t *td;
};
1.10 +4 -4 apache-apr/include/apr_thread_proc.h
Index: apr_thread_proc.h
===================================================================
RCS file: /home/cvs/apache-apr/include/apr_thread_proc.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr_thread_proc.h 1999/05/12 20:04:21 1.9
+++ apr_thread_proc.h 1999/05/21 13:02:33 1.10
@@ -67,10 +67,10 @@
typedef enum {APR_SHELLCMD, APR_PROGRAM} ap_cmdtype_e;
typedef enum {APR_WAIT, APR_NOWAIT} ap_wait_how_e;
-#define CANCEL_ASYNCH APR_CANCEL_ASYNCH
-#define CANCEL_DEFER APR_CANCEL_DEFER
-#define CANCEL_ENABLE APR_CANCEL_ENABLE
-#define CANCEL_DISABLE APR_CANCEL_DISABLE
+#define APR_CANCEL_ASYNCH 1
+#define APR_CANCEL_DEFER 2
+#define APR_CANCEL_ENABLE 3
+#define APR_CANCEL_DISABLE 4
typedef struct thread_t ap_thread_t;
typedef struct threadattr_t ap_threadattr_t;
