bjh 99/06/11 00:23:07
Modified: apr/file_io/os2 fileio.h
apr/locks/os2 Makefile.in
apr/network_io/os2 poll.c
Log:
Fix a few warnings in OS/2 code
Revision Changes Path
1.2 +1 -0 apache-apr/apr/file_io/os2/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/os2/fileio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fileio.h 1999/06/04 13:13:19 1.1
+++ fileio.h 1999/06/11 07:22:41 1.2
@@ -88,6 +88,7 @@
ap_status_t file_cleanup(void *);
mode_t get_fileperms(ap_fileperms_t);
long os2date2unix( FDATE os2date, FTIME os2time );
+int os2errno( ULONG oserror );
#endif /* ! FILE_IO_H */
1.2 +1 -1 apache-apr/apr/locks/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/os2/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/06/04 16:40:04 1.1
+++ Makefile.in 1999/06/11 07:22:52 1.2
@@ -10,7 +10,7 @@
[EMAIL PROTECTED]@ $(LDLIBS)
INCDIR=../../include
INCDIR1=../../../include
-INCDIR2=../../file_io/unix
+INCDIR2=../../file_io/os2
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
LIB=../lock.a
1.2 +2 -2 apache-apr/apr/network_io/os2/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/os2/poll.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poll.c 1999/06/04 16:15:56 1.1
+++ poll.c 1999/06/11 07:23:01 1.2
@@ -57,8 +57,9 @@
#include "networkio.h"
#include "apr_network_io.h"
#include "apr_general.h"
+#include "apr_lib.h"
-/* OS/2 R4 doesn't have a poll function, implement using select */
+/* OS/2 doesn't have a poll function, implement using select */
ap_status_t ap_setup_poll(ap_context_t *cont, ap_int32_t num, struct
pollfd_t **new)
{
@@ -90,7 +91,6 @@
int i;
int rv = 0, maxfd = 0;
time_t starttime;
- char test = 'T';
struct timeval tv;
fd_set readfds, writefds, exceptfds;