rbb 99/06/15 12:43:53
Modified: apr Makefile.in configure.in
apr/file_io/unix Makefile.in dir.c
apr/include apr_config.h.in
apr/locks/unix Makefile.in crossproc.c
apr/misc/unix Makefile.in
apr/network_io/unix Makefile.in
apr/test Makefile.in
apr/threadproc/unix Makefile.in
apr/time/unix Makefile.in
Log:
Changes to make everything compile on FreeBSD. I will be adding the select
based poll in a few minutes. Everything compiles and runs, except for the
testsock stuff, and ab. Both of these will be fixed with ap_poll.
Submitted by: David Reid and Ryan Bloom
Revision Changes Path
1.9 +2 -0 apache-apr/apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 1999/06/04 17:04:10 1.8
+++ Makefile.in 1999/06/15 19:42:58 1.9
@@ -6,10 +6,12 @@
#
# Macros for compilation commands
#
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LDLIBS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
#
# Macros for supporting directories
1.20 +1 -0 apache-apr/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.in 1999/06/11 07:05:21 1.19
+++ configure.in 1999/06/15 19:43:03 1.20
@@ -79,6 +79,7 @@
fi
if (test "$SYS_SW" = "FreeBSD"); then
+ CFLAGS="$CFLAGS -pthread -U__STR__ -DUSE_PTHREAD_SERIALIZE
-DUSE_FLOCK_SERIALIZE"
PLATFORM="-DFreeBSD"
OSDIR="unix"
fi
1.2 +1 -0 apache-apr/apr/file_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/unix/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/05/12 20:32:05 1.1
+++ Makefile.in 1999/06/15 19:43:18 1.2
@@ -3,6 +3,7 @@
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
1.14 +1 -0 apache-apr/apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/unix/dir.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dir.c 1999/06/02 18:44:32 1.13
+++ dir.c 1999/06/15 19:43:20 1.14
@@ -53,6 +53,7 @@
*
*/
+#include <sys/types.h>
#include <errno.h>
#include <string.h>
#include <dirent.h>
1.7 +4 -4 apache-apr/apr/include/apr_config.h.in
Index: apr_config.h.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_config.h.in 1999/06/06 08:57:57 1.6
+++ apr_config.h.in 1999/06/15 19:43:26 1.7
@@ -239,6 +239,10 @@
#include <unix.h>
#endif /* HAVE_UNIX_H */
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
+
/*
* Header files to include *except* for a particular platform.
*/
@@ -249,10 +253,6 @@
#endif /* HAVE_ARPA_INET_H */
#endif /* OS2 */
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
1.2 +1 -0 apache-apr/apr/locks/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/unix/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/05/12 20:32:07 1.1
+++ Makefile.in 1999/06/15 19:43:34 1.2
@@ -3,6 +3,7 @@
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
1.8 +3 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crossproc.c 1999/06/02 18:44:40 1.7
+++ crossproc.c 1999/06/15 19:43:35 1.8
@@ -290,7 +290,7 @@
if (flock(lock->interproc, LOCK_UN) < 0) {
return errno;
}
- new->curr_locked == 0;
+ lock->curr_locked == 0;
}
unlink(lock->fname);
return APR_SUCCESS;
@@ -311,7 +311,7 @@
ap_status_t lock_inter(struct lock_t *lock)
{
- new->curr_locked == 1;
+ lock->curr_locked == 1;
if (flock(lock->interproc, LOCK_EX) < 0) {
return errno;
}
@@ -323,7 +323,7 @@
if (flock(lock->interproc, LOCK_UN) < 0) {
return errno;
}
- new->curr_locked == 0;
+ lock->curr_locked == 0;
return APR_SUCCESS;
}
1.4 +1 -0 apache-apr/apr/misc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/misc/unix/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 1999/06/02 18:56:37 1.3
+++ Makefile.in 1999/06/15 19:43:39 1.4
@@ -3,6 +3,7 @@
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
1.2 +1 -0 apache-apr/apr/network_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/unix/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/05/12 20:32:10 1.1
+++ Makefile.in 1999/06/15 19:43:42 1.2
@@ -3,6 +3,7 @@
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
1.10 +1 -0 apache-apr/apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/test/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 1999/06/06 08:57:58 1.9
+++ Makefile.in 1999/06/15 19:43:46 1.10
@@ -4,6 +4,7 @@
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
1.3 +1 -0 apache-apr/apr/threadproc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 1999/05/13 13:06:52 1.2
+++ Makefile.in 1999/06/15 19:43:48 1.3
@@ -3,6 +3,7 @@
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
1.2 +1 -0 apache-apr/apr/time/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/time/unix/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/05/16 13:24:49 1.1
+++ Makefile.in 1999/06/15 19:43:50 1.2
@@ -3,6 +3,7 @@
#INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
#LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@
