httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/include apr_network_io.h
Date Mon, 09 Aug 1999 19:25:09 GMT
rbb         99/08/09 12:25:08

  Modified:    apr/network_io/win32 network_io.def poll.c
               apr/test ab_apr.c ab_apr.dsp client.dsp server.dsp
                        testarg.dsp testfile.dsp testproc.dsp testsig.dsp
                        testsock.dsp testthread.dsp timetest.dsp
               apr/time/win32 time.c
               include  apr_network_io.h
  Log:
  Make ab_apr work on NT.  Not sure of the number being returned, but it
  actually executes now!
  
  Revision  Changes    Path
  1.4       +3 -1      apache-apr/apr/network_io/win32/network_io.def
  
  Index: network_io.def
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/win32/network_io.def,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- network_io.def	1999/07/02 19:09:20	1.3
  +++ network_io.def	1999/08/09 19:24:56	1.4
  @@ -26,4 +26,6 @@
       ap_set_socketdata   @19
       ap_get_polldata   @20
       ap_set_polldata   @21
  -    ap_get_os_sock   @22
  \ No newline at end of file
  +    ap_get_os_sock   @22
  +    ap_remove_poll_socket   @23
  +    ap_clear_poll_sockets   @24
  \ No newline at end of file
  
  
  
  1.4       +37 -3     apache-apr/apr/network_io/win32/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/win32/poll.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- poll.c	1999/06/23 15:00:09	1.3
  +++ poll.c	1999/08/09 19:24:56	1.4
  @@ -113,9 +113,8 @@
       else {
           /* Convert milli-seconds into seconds and micro-seconds. */
           thetime = (struct timeval *)ap_palloc(aprset->cntxt, sizeof(struct timeval));
  -        thetime->tv_sec = timeout / (1000);
  -        timeout = timeout % 1000;
  -        thetime->tv_usec = timeout * 1000;
  +        thetime->tv_sec = timeout;
  +        thetime->tv_usec = 0;
       }
   
       if (aprset->numread != 0) {
  @@ -138,6 +137,7 @@
   
       (*nsds) = rv;    
       if ((*nsds) < 0) {
  +        rv = GetLastError();
           return APR_EEXIST;
       }
       return APR_SUCCESS;
  @@ -218,3 +218,37 @@
       }
   }
   
  +ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset, 
  +                                  struct socket_t *sock, ap_int16_t events)
  +{
  +    if (events & APR_POLLIN) {
  +        FD_CLR(sock->sock, aprset->read);
  +        aprset->numread--;
  +    }
  +    if (events & APR_POLLPRI) {
  +        FD_CLR(sock->sock, aprset->read);
  +        aprset->numexcept--;
  +    }
  +    if (events & APR_POLLOUT) {
  +        FD_CLR(sock->sock, aprset->write);
  +        aprset->numwrite--;
  +    }
  +    return APR_SUCCESS;
  +}
  +
  +ap_status_t ap_clear_poll_sockets(struct pollfd_t *aprset, ap_int16_t events)
  +{
  +    if (events & APR_POLLIN) {
  +        FD_ZERO(aprset->read);
  +        aprset->numread = 0;
  +    }
  +    if (events & APR_POLLPRI) {
  +        FD_ZERO(aprset->read);
  +        aprset->numexcept = 0;
  +    }
  +    if (events & APR_POLLOUT) {
  +        FD_ZERO(aprset->write);
  +        aprset->numwrite = 0;
  +    }
  +    return APR_SUCCESS;
  +}
  
  
  
  1.16      +10 -6     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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ab_apr.c	1999/08/09 15:52:29	1.15
  +++ ab_apr.c	1999/08/09 19:24:57	1.16
  @@ -230,6 +230,7 @@
   
       c->state = STATE_READ;
       ap_add_poll_socket(readbits, c->aprsock, APR_POLLIN);
  +    ap_remove_poll_socket(readbits, c->aprsock, APR_POLLOUT);
   }
   
           /* --------------------------------------------------------- */
  @@ -498,6 +499,7 @@
           }
       }
   
  +    ap_remove_poll_socket(readbits, c->aprsock, APR_POLLIN | APR_POLLOUT);
       ap_close_socket(c->aprsock);
   
       /* connect again */
  @@ -559,8 +561,9 @@
           	return;
               }
               else {
  -/* header is in invalid or too big - close connection */
  -        	ap_close_socket(c->aprsock);
  +            /* header is in invalid or too big - close connection */
  +        	ap_remove_poll_socket(readbits, c->aprsock, APR_POLLOUT);
  +            ap_close_socket(c->aprsock);
           	if (bad++ > 10) {
           	    err("\nTest aborted after 10 failures\n\n");
           	}
  @@ -680,10 +683,11 @@
       stats = (struct data *)malloc(requests * sizeof(struct data));
       ap_setup_poll(cntxt, concurrency, &readbits);
   
  -    ap_make_time(cntxt, &con->start);
  -    ap_make_time(cntxt, &con->connect);
  -    ap_make_time(cntxt, &con->done);
  -
  +    for (i = 0; i < concurrency; i++) {
  +        ap_make_time(cntxt, &con[i].start);
  +        ap_make_time(cntxt, &con[i].connect);
  +        ap_make_time(cntxt, &con[i].done);
  +    }
   
       /* setup request */
       if (!posting) {
  
  
  
  1.2       +1 -1      apache-apr/apr/test/ab_apr.dsp
  
  Index: ab_apr.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/ab_apr.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ab_apr.dsp	1999/08/08 21:19:46	1.1
  +++ ab_apr.dsp	1999/08/09 19:24:57	1.2
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"ab_apr\ab.exe"
/pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.7       +1 -1      apache-apr/apr/test/client.dsp
  
  Index: client.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/client.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- client.dsp	1999/08/08 21:19:47	1.6
  +++ client.dsp	1999/08/09 19:24:58	1.7
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
  +# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.7       +1 -1      apache-apr/apr/test/server.dsp
  
  Index: server.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/server.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- server.dsp	1999/08/08 21:19:48	1.6
  +++ server.dsp	1999/08/09 19:24:58	1.7
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
  +# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.2       +1 -1      apache-apr/apr/test/testarg.dsp
  
  Index: testarg.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testarg.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testarg.dsp	1999/08/08 21:19:49	1.1
  +++ testarg.dsp	1999/08/09 19:24:58	1.2
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.9       +1 -1      apache-apr/apr/test/testfile.dsp
  
  Index: testfile.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testfile.dsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- testfile.dsp	1999/08/08 21:19:51	1.8
  +++ testfile.dsp	1999/08/09 19:24:58	1.9
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
  +# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.8       +1 -1      apache-apr/apr/test/testproc.dsp
  
  Index: testproc.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testproc.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- testproc.dsp	1999/08/08 21:19:52	1.7
  +++ testproc.dsp	1999/08/09 19:24:58	1.8
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
  +# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.3       +1 -1      apache-apr/apr/test/testsig.dsp
  
  Index: testsig.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testsig.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testsig.dsp	1999/08/08 21:19:52	1.2
  +++ testsig.dsp	1999/08/09 19:24:59	1.3
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.7       +1 -1      apache-apr/apr/test/testsock.dsp
  
  Index: testsock.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testsock.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- testsock.dsp	1999/08/08 21:19:53	1.6
  +++ testsock.dsp	1999/08/09 19:24:59	1.7
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
  +# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.3       +1 -1      apache-apr/apr/test/testthread.dsp
  
  Index: testthread.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testthread.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testthread.dsp	1999/08/08 21:19:54	1.2
  +++ testthread.dsp	1999/08/09 19:24:59	1.3
  @@ -76,7 +76,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib ..\threadproc\win32\Debug\threadproc.lib
..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib ..\locks\win32\Debug\locks.lib
..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.6       +1 -1      apache-apr/apr/test/timetest.dsp
  
  Index: timetest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/timetest.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- timetest.dsp	1999/08/08 21:19:54	1.5
  +++ timetest.dsp	1999/08/09 19:24:59	1.6
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
  +# ADD LINK32 ..\locks\win32\debug\locks.lib ..\lib\Debug\lib.lib ..\misc\win32\Debug\misc.lib
..\threadproc\win32\Debug\threadproc.lib ..\file_io\win32\Debug\file_io.lib ..\time\win32\Debug\time.lib
..\locks\win32\Debug\locks.lib ..\network_io\win32\Debug\network_io.lib ..\signal\win32\Debug\signal.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/out:"ab.exe" /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.5       +2 -2      apache-apr/apr/time/win32/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/time/win32/time.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- time.c	1999/08/08 21:20:03	1.4
  +++ time.c	1999/08/09 19:25:03	1.5
  @@ -111,7 +111,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_time(struct atime_t *thetime, ap_os_time_t *atime)
  +ap_status_t ap_get_os_time(struct atime_t *thetime, ap_os_time_t **atime)
   {
       if (thetime == NULL) {
           return APR_ENOTIME;
  @@ -119,7 +119,7 @@
       if (thetime->explodedtime == NULL) {
           ap_explode_time(thetime, APR_LOCALTIME); 
       }
  -    atime = thetime->explodedtime;
  +    *atime = thetime->explodedtime;
       return APR_SUCCESS;
   }
   
  
  
  
  1.27      +1 -1      apache-apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_network_io.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- apr_network_io.h	1999/08/09 17:58:02	1.26
  +++ apr_network_io.h	1999/08/09 19:25:05	1.27
  @@ -122,7 +122,7 @@
   ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t);
   ap_status_t ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
   ap_status_t ap_remove_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
  -ap_status_t ap_clear_poll_sockets(ap_pollfd_t *);
  +ap_status_t ap_clear_poll_sockets(ap_pollfd_t *, ap_int16_t);
   ap_status_t ap_get_revents(ap_pollfd_t *, ap_socket_t *, ap_int16_t *);
   ap_status_t ap_get_polldata(ap_pollfd_t *, void *);
   ap_status_t ap_set_polldata(ap_pollfd_t *, void *);
  
  
  

Mime
View raw message