bjh 99/08/28 01:05:46
Modified: src/lib/apr Makefile.in config.guess config.sub configure.in
src/lib/apr/file_io/os2 readwrite.c
src/lib/apr/network_io/os2 poll.c
src/lib/apr/threadproc/os2 proc.c
Log:
Fix build of APR on OS/2
Revision Changes Path
1.5 +1 -1 apache-2.0/src/lib/apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 1999/08/27 16:25:33 1.4
+++ Makefile.in 1999/08/28 08:05:42 1.5
@@ -41,7 +41,7 @@
all: Makefile $(MODULES) subdirs
rm -Rf libs
mkdir libs
- @for i in $(SUBDIRS); do cp $$i/lib*.a libs ; done;
+ @for i in $(SUBDIRS); do cp $$i/*.a libs ; done;
@echo APR built.
clean: subdirs_clean
1.2 +3 -0 apache-2.0/src/lib/apr/config.guess
Index: config.guess
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/config.guess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.guess 1999/08/17 15:59:35 1.1
+++ config.guess 1999/08/28 08:05:43 1.2
@@ -938,6 +938,9 @@
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
+ *:OS/2:*:*)
+ echo "i386-pc-os2_emx"
+ exit 0;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
1.2 +2 -0 apache-2.0/src/lib/apr/config.sub
Index: config.sub
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/config.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.sub 1999/08/17 15:59:35 1.1
+++ config.sub 1999/08/28 08:05:43 1.2
@@ -891,6 +891,8 @@
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
+ -os2_emx)
+ ;;
# First accept the basic system types.
# The portable systems comes first.
# Each alternative MUST END IN A *, to match a version number.
1.4 +3 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 1999/08/19 13:31:09 1.3
+++ configure.in 1999/08/28 08:05:43 1.4
@@ -78,6 +78,9 @@
AC_CHECK_LIB(pthread, pthread_mutex_init, AC_DEFINE(USE_PTHREAD_SERIALIZE))
case "$OS" in
+ *-os2*)
+ OSDIR="os2"
+ ;;
*beos*)
OSDIR="beos"
;;
1.2 +1 -1 apache-2.0/src/lib/apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readwrite.c 1999/08/17 15:59:36 1.1
+++ readwrite.c 1999/08/28 08:05:44 1.2
@@ -60,7 +60,7 @@
#define INCL_DOS
#include <os2.h>
-ap_status_t ap_read(const struct file_t *thefile, void *buf, ap_ssize_t
*nbytes)
+ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
{
ULONG rc;
ULONG bytesread;
1.2 +1 -0 apache-2.0/src/lib/apr/network_io/os2/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poll.c 1999/08/17 15:59:43 1.1
+++ poll.c 1999/08/28 08:05:45 1.2
@@ -58,6 +58,7 @@
#include "apr_network_io.h"
#include "apr_general.h"
#include "apr_lib.h"
+#include <sys/time.h>
/* OS/2 doesn't have a poll function, implement using select */
1.2 +1 -0 apache-2.0/src/lib/apr/threadproc/os2/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proc.c 1999/08/17 15:59:50 1.1
+++ proc.c 1999/08/28 08:05:45 1.2
@@ -64,6 +64,7 @@
#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
+#include <process.h>
#define INCL_DOS
#include <os2.h>
