rbb 99/08/08 14:20:07
Modified: apr acconfig.h apr/file_io/win32 file_io.dsp readwrite.c apr/include apr_pools.h apr_win.h apr/lib lib.dsp apr/misc/win32 misc.def misc.dsp apr/test ab_apr.c client.dsp server.dsp test.dsw testargs.c testfile.c testfile.dsp testproc.dsp testsig.dsp testsock.dsp testthread.dsp timetest.dsp apr/time/win32 time.c time.def include apr_general.h apr_time.h Added: apr/misc/win32 getopt.c apr/test ab_apr.dsp testarg.dsp Log: Make apr compile on NT again. Also get the testarg test working, and the getopt stuff working on NT. :) Revision Changes Path 1.3 +1 -0 apache-apr/apr/acconfig.h Index: acconfig.h =================================================================== RCS file: /home/cvs/apache-apr/apr/acconfig.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- acconfig.h 1999/07/23 14:41:34 1.2 +++ acconfig.h 1999/08/08 21:19:34 1.3 @@ -21,6 +21,7 @@ @BOTTOM@ #define API_EXPORT(type) type #define API_EXPORT_NONSTD(type) type +#define API_VAR_IMPORT extern /* Make sure we have ssize_t defined to be somethine */ #undef ssize_t 1.2 +1 -1 apache-apr/apr/file_io/win32/file_io.dsp Index: file_io.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/file_io/win32/file_io.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- file_io.dsp 1999/06/03 19:43:44 1.1 +++ file_io.dsp 1999/08/08 21:19:35 1.2 @@ -68,7 +68,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" 1.3 +1 -1 apache-apr/apr/file_io/win32/readwrite.c Index: readwrite.c =================================================================== RCS file: /home/cvs/apache-apr/apr/file_io/win32/readwrite.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- readwrite.c 1999/06/23 21:09:18 1.2 +++ readwrite.c 1999/08/08 21:19:36 1.3 @@ -60,7 +60,7 @@ #include "apr_errno.h" #include <windows.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) { DWORD bread; int lasterror; 1.6 +2 -0 apache-apr/apr/include/apr_pools.h Index: apr_pools.h =================================================================== RCS file: /home/cvs/apache-apr/apr/include/apr_pools.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apr_pools.h 1999/07/13 19:51:25 1.5 +++ apr_pools.h 1999/08/08 21:19:37 1.6 @@ -90,7 +90,9 @@ #include "apr_lib.h" #include <sys/types.h> +#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> +#endif #include <signal.h> struct process_chain { 1.9 +6 -1 apache-apr/apr/include/apr_win.h Index: apr_win.h =================================================================== RCS file: /home/cvs/apache-apr/apr/include/apr_win.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_win.h 1999/08/04 17:51:57 1.8 +++ apr_win.h 1999/08/08 21:19:38 1.9 @@ -61,6 +61,7 @@ #include <winsock2.h> #include <windows.h> #include <sys\types.h> +#include <stddef.h> #include <stdio.h> #include <time.h> @@ -103,11 +104,15 @@ typedef void (Sigfunc)(int); #define __attribute__(__x) -#define APR_INLINE +#define SIZEOF_SHORT 2 +#define SIZEOF_INT 4 +#define SIZEOF_LONGLONG 8 + #define API_EXPORT(x) x #define API_EXPORT_NONSTD(x) x #define API_THREAD_FUNC __stdcall +#define API_VAR_IMPORT _declspec(dllimport) #define strcasecmp(s1, s2) stricmp(s1, s2) #define sleep(t) Sleep(t * 1000) 1.4 +4 -0 apache-apr/apr/lib/lib.dsp Index: lib.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/lib/lib.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lib.dsp 1999/06/02 19:38:01 1.3 +++ lib.dsp 1999/08/08 21:19:39 1.4 @@ -115,6 +115,10 @@ # End Source File # Begin Source File +SOURCE=.\apr_tables.c +# End Source File +# Begin Source File + SOURCE=.\lib.def # End Source File # End Target 1.5 +7 -1 apache-apr/apr/misc/win32/misc.def Index: misc.def =================================================================== RCS file: /home/cvs/apache-apr/apr/misc/win32/misc.def,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- misc.def 1999/06/29 15:52:08 1.4 +++ misc.def 1999/08/08 21:19:42 1.5 @@ -15,4 +15,10 @@ ap_get_oslevel @8 ap_get_userdata @9 ap_set_userdata @10 - ap_initialize @11 \ No newline at end of file + ap_initialize @11 + ap_getopt @12 + opterr @13 DATA + optind @14 DATA + optopt @15 DATA + optreset @16 DATA + optarg @17 DATA 1.4 +4 -0 apache-apr/apr/misc/win32/misc.dsp Index: misc.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/misc/win32/misc.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- misc.dsp 1999/06/29 15:52:08 1.3 +++ misc.dsp 1999/08/08 21:19:44 1.4 @@ -87,6 +87,10 @@ # Name "misc - Win32 Debug" # Begin Source File +SOURCE=.\getopt.c +# End Source File +# Begin Source File + SOURCE=.\misc.def # End Source File # Begin Source File 1.1 apache-apr/apr/misc/win32/getopt.c Index: getopt.c =================================================================== /* * Copyright (c) 1987, 1993, 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "misc.h" int opterr = 1, /* if error message should be printed */ optind = 1, /* index into parent argv vector */ optopt, /* character checked for validity */ optreset; /* reset getopt */ char *optarg = ""; /* argument associated with option */ #define EMSG "" /* ***APRDOC******************************************************** * ap_status_t ap_getopt(ap_context_t *, ap_int32_t, char *const *, * const char *, ap_int32_t) * Parse the command line options passed to the program. * arg 1) The context to operate on. * arg 2) The number of arguments passed to ap_getopt to parse * arg 3) The array of command line options to parse * arg 4) A string of characters that are acceptable options to the program. * characters followed by ":" are required to have an option * associated * arg 5) The next option found. There are four potential values for * this variable on exit. They are: * APR_EOF -- No more options to parse * APR_BADCH -- Found a bad option character * APR_BADARG -- Missing parameter for the found option * Other -- The next option found. * NOTE: Arguments 2 and 3 are most commonly argc and argv from * main(argc, argv) */ ap_status_t ap_getopt(struct context_t *cont, ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv) { char *p; static char *place = EMSG; /* option letter processing */ char *oli; /* option letter list index */ if (optreset || !*place) { /* update scanning pointer */ optreset = 0; if (optind >= nargc || *(place = nargv[optind]) != '-') { place = EMSG; *rv = optopt; return (APR_EOF); } if (place[1] && *++place == '-') { /* found "--" */ ++optind; place = EMSG; *rv = optopt; return (APR_EOF); } } /* option letter okay? */ if ((optopt = (int) *place++) == (int) ':' || !(oli = strchr(ostr, optopt))) { /* * if the user didn't specify '-' as an option, * assume it means -1. */ if (optopt == (int) '-') *rv = optopt; return (APR_EOF); if (!*place) ++optind; if (opterr && *ostr != ':') { if (!(p = strrchr(*nargv, '/'))) p = *nargv; else ++p; (void) fprintf(stderr, "%s: illegal option -- %c\n", p, optopt); } *rv = optopt; return APR_BADCH; } if (*++oli != ':') { /* don't need argument */ optarg = NULL; if (!*place) ++optind; } else { /* need an argument */ if (*place) /* no white space */ optarg = place; else if (nargc <= ++optind) { /* no arg */ place = EMSG; if (*ostr == ':') *rv = optopt; return (APR_BADARG); if (opterr) { if (!(p = strrchr(*nargv, '/'))) p = *nargv; else ++p; (void) fprintf(stderr, "%s: option requires an argument -- %c\n", p, optopt); } *rv = optopt; return (APR_BADCH); } else /* white space */ optarg = nargv[optind]; place = EMSG; ++optind; } *rv = optopt; return APR_SUCCESS; } 1.14 +36 -27 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ab_apr.c 1999/06/16 11:16:04 1.13 +++ ab_apr.c 1999/08/08 21:19:45 1.14 @@ -105,12 +105,11 @@ #include "apr_network_io.h" #include "apr_file_io.h" -#include <sys/time.h> +#include "apr_time.h" #include <string.h> #include <stdio.h> /* ------------------- DEFINITIONS -------------------------- */ - /* maximum number of requests on a time limited test */ #define MAX_REQUESTS 50000 @@ -131,7 +130,7 @@ int cbx; /* offset in cbuffer */ int keepalive; /* non-zero if a keep-alive request */ int gotheader; /* non-zero if we have the entire header in cbuff */ - struct timeval start, connect, done; + ap_time_t *start, *connect, *done; int socknum; }; @@ -145,6 +144,8 @@ #define ap_max(a,b) ((a)>(b))?(a):(b) /* --------------------- GLOBALS ---------------------------- */ +API_VAR_IMPORT char *optarg; /* argument associated with option */ +API_VAR_IMPORT int optind; int verbosity = 0; /* no verbosity by default */ int posting = 0; /* GET by default */ @@ -179,7 +180,7 @@ int err_length = 0, err_conn = 0, err_except = 0; int err_response = 0; -struct timeval start, endtime; +ap_time_t *start, *endtime; /* global request (and its length) */ char request[512]; @@ -217,7 +218,7 @@ static void write_request(struct connection *c) { ap_ssize_t len = reqlen; - gettimeofday(&c->connect, 0); + ap_current_time(c->connect); if (ap_send(c->aprsock, request, &reqlen, 30) != APR_SUCCESS && reqlen != len) { printf("Send request failed!\n"); @@ -253,8 +254,8 @@ { int timetaken; - gettimeofday(&endtime, 0); - timetaken = timedif(endtime, start); + ap_current_time(endtime); + ap_timediff(endtime, start, &timetaken); printf("\r \r"); printf("Server Software: %s\n", servername); @@ -328,8 +329,8 @@ { int timetaken; - gettimeofday(&endtime, 0); - timetaken = timedif(endtime, start); + ap_current_time(endtime); + ap_timediff(endtime, start, &timetaken); printf("\n\n<table %s>\n", tablestring); printf("<tr %s><th colspan=2 %s>Server Software:</th>" @@ -460,9 +461,9 @@ if (ap_setport(c->aprsock, port) != APR_SUCCESS) { err("Port:"); } - gettimeofday(&c->start, 0); + ap_current_time(c->start); if (ap_connect(c->aprsock, hostname) != APR_SUCCESS) { - if (errno == EINPROGRESS) { + if (errno == APR_EINPROGRESS) { c->state = STATE_CONNECTING; ap_add_poll_socket(readbits, c->aprsock, APR_POLLOUT); return; @@ -503,10 +504,10 @@ /* save out time */ if (done < requests) { struct data s; - gettimeofday(&c->done, 0); + ap_current_time(c->done); s.read = c->read; - s.ctime = timedif(c->connect, c->start); - s.time = timedif(c->done, c->start); + ap_timediff(c->connect, c->start, &s.ctime); + ap_timediff(c->done, c->start, &s.time); stats[done++] = s; } } @@ -653,10 +654,10 @@ } if (done < requests) { struct data s; - gettimeofday(&c->done, 0); + ap_current_time(c->done); s.read = c->read; - s.ctime = timedif(c->connect, c->start); - s.time = timedif(c->done, c->start); + ap_timediff(c->connect, c->start, &s.ctime); + ap_timediff(c->done, c->start, &s.time); stats[done++] = s; } c->keepalive = 0; @@ -675,7 +676,7 @@ static void test(void) { - struct timeval now; + ap_time_t *now; time_t timeout; ap_int16_t rv; int i; @@ -685,12 +686,19 @@ fflush(stdout); } + ap_make_time(cntxt, &now); + con = (struct connection *)malloc(concurrency * sizeof(struct connection)); memset(con, 0, concurrency * sizeof(struct connection)); 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); + + /* setup request */ if (!posting) { sprintf(request, "GET %s HTTP/1.0\r\n" @@ -730,7 +738,7 @@ #endif /*CHARSET_EBCDIC */ /* ok - lets start */ - gettimeofday(&start, 0); + ap_current_time(start); /* initialise lots of requests */ for (i = 0; i < concurrency; i++) { @@ -740,10 +748,12 @@ while (done < requests) { ap_int32_t n; + ap_int32_t timed; /* check for time limit expiry */ - gettimeofday(&now, 0); - if (tlimit && timedif(now, start) > (tlimit * 1000)) { + ap_current_time(now); + ap_timediff(now, start, &timed); + if (tlimit && timed > (tlimit * 1000)) { requests = done; /* so stats are correct */ } /* Timeout of 30 seconds. */ @@ -854,7 +864,6 @@ static int open_postfile(char *pfile) { ap_file_t *postfd = NULL; - int status; ap_fileperms_t mode; ap_ssize_t length; @@ -882,9 +891,6 @@ /* ------------------------------------------------------- */ -extern char *optarg; -extern int optind, opterr, optopt; - /* sort out command-line args and call test */ int main(int argc, char **argv) { @@ -897,8 +903,11 @@ ap_create_context(NULL, NULL, &cntxt); + ap_make_time(cntxt, &start); + ap_make_time(cntxt, &endtime); + optind = 1; - while ((c = getopt(argc, argv, "n:c:t:T:p:v:kVhwx:y:z:")) > 0) { + while (ap_getopt(cntxt, argc, argv, "n:c:t:T:p:v:kVhwx:y:z:", &c) == APR_SUCCESS) { switch (c) { case 'n': requests = atoi(optarg); @@ -972,5 +981,5 @@ copyright(); test(); - exit(0); + return(0); } 1.6 +3 -2 apache-apr/apr/test/client.dsp Index: client.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/client.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- client.dsp 1999/06/29 15:52:11 1.5 +++ client.dsp 1999/08/08 21:19:47 1.6 @@ -49,7 +49,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 /machine:I386 -# ADD LINK32 ..\network_io\win32\Debug\network_io.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 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 /machine:I386 +# ADD LINK32 ..\network_io\win32\Debug\network_io.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 ..\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 /machine:I386 !ELSEIF "$(CFG)" == "client - Win32 Debug" @@ -65,7 +65,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_STDIO_H" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_STDIO_H" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.6 +3 -2 apache-apr/apr/test/server.dsp Index: server.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/server.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- server.dsp 1999/06/29 15:52:11 1.5 +++ server.dsp 1999/08/08 21:19:48 1.6 @@ -49,7 +49,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 /machine:I386 -# ADD LINK32 ..\network_io\win32\Debug\network_io.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 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 /machine:I386 +# ADD LINK32 ..\network_io\win32\Debug\network_io.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 ..\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 /machine:I386 !ELSEIF "$(CFG)" == "server - Win32 Debug" @@ -65,7 +65,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_STDIO_H" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_STDIO_H" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.5 +24 -0 apache-apr/apr/test/test.dsw Index: test.dsw =================================================================== RCS file: /home/cvs/apache-apr/apr/test/test.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- test.dsw 1999/06/29 15:52:11 1.4 +++ test.dsw 1999/08/08 21:19:48 1.5 @@ -3,6 +3,18 @@ ############################################################################### +Project: "ab_apr"=".\ab_apr.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "client"=".\client.dsp" - Package Owner=<4> Package=<5> @@ -16,6 +28,18 @@ ############################################################################### Project: "server"=".\server.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "testarg"=".\testarg.dsp" - Package Owner=<4> Package=<5> {{{ 1.2 +5 -1 apache-apr/apr/test/testargs.c Index: testargs.c =================================================================== RCS file: /home/cvs/apache-apr/apr/test/testargs.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testargs.c 1999/07/27 17:58:35 1.1 +++ testargs.c 1999/08/08 21:19:50 1.2 @@ -52,15 +52,18 @@ * project, please see <http://www.apache.org/>. * */ -#include <stdio.h> + #include "apr_file_io.h" #include "apr_errno.h" #include "apr_general.h" #include "apr_lib.h" +#include <stdio.h> #ifdef BEOS #include <unistd.h> #endif +API_VAR_IMPORT char *optarg; /* argument associated with option */ + int main(int argc, char * const argv[]) { ap_context_t *context; @@ -88,4 +91,5 @@ break; } } + return 1; } 1.30 +3 -3 apache-apr/apr/test/testfile.c Index: testfile.c =================================================================== RCS file: /home/cvs/apache-apr/apr/test/testfile.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- testfile.c 1999/06/08 17:30:02 1.29 +++ testfile.c 1999/08/08 21:19:51 1.30 @@ -113,7 +113,7 @@ perror("something's wrong"); exit(-1); } - if (nbytes != strlen("this is a test")) { + if (nbytes != (ap_ssize_t)strlen("this is a test")) { fprintf(stderr, "didn't write properly.\n"); exit(-1); } @@ -138,7 +138,7 @@ perror("something's wrong"); exit(-1); } - if (nbytes != strlen("this is a test")) { + if (nbytes != (ap_ssize_t)strlen("this is a test")) { fprintf(stderr, "didn't read properly.\n"); exit(-1); } @@ -282,7 +282,7 @@ fprintf(stdout, "\t\tFile size......."); ap_dir_entry_size(temp, &bytes); - if (bytes != strlen("Another test!!!")) { + if (bytes != (ap_ssize_t)strlen("Another test!!!")) { fprintf(stderr, "Got wrong file size %d\n", bytes); return -1; } 1.8 +3 -2 apache-apr/apr/test/testfile.dsp Index: testfile.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/testfile.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testfile.dsp 1999/06/29 15:52:11 1.7 +++ testfile.dsp 1999/08/08 21:19:51 1.8 @@ -50,7 +50,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 /machine:I386 -# ADD LINK32 ..\network_io\win32\Debug ..\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 ..\network_io\win32\Debug\network_io.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 +# ADD LINK32 ..\network_io\win32\Debug ..\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 ..\network_io\win32\Debug\network_io.lib ..\locks\win32\Debug\locks.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 !ELSEIF "$(CFG)" == "testfile - Win32 Debug" @@ -66,7 +66,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.7 +3 -2 apache-apr/apr/test/testproc.dsp Index: testproc.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/testproc.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- testproc.dsp 1999/06/29 15:52:11 1.6 +++ testproc.dsp 1999/08/08 21:19:52 1.7 @@ -50,7 +50,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 /machine:I386 -# ADD LINK32 ..\network_io\win32\Debug ..\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 ..\network_io\win32\Debug\network_io.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 /machine:I386 +# ADD LINK32 ..\network_io\win32\Debug ..\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 ..\network_io\win32\Debug\network_io.lib ..\locks\win32\Debug\locks.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 /machine:I386 !ELSEIF "$(CFG)" == "testproc - Win32 Debug" @@ -66,7 +66,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.2 +5 -3 apache-apr/apr/test/testsig.dsp Index: testsig.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/testsig.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testsig.dsp 1999/08/04 19:42:32 1.1 +++ testsig.dsp 1999/08/08 21:19:52 1.2 @@ -38,9 +38,10 @@ # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -48,7 +49,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 /machine:I386 -# ADD 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 /machine:I386 +# 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 /machine:I386 !ELSEIF "$(CFG)" == "testsig - Win32 Debug" @@ -64,7 +65,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.6 +3 -2 apache-apr/apr/test/testsock.dsp Index: testsock.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/testsock.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- testsock.dsp 1999/06/29 15:52:11 1.5 +++ testsock.dsp 1999/08/08 21:19:53 1.6 @@ -50,7 +50,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 /machine:I386 -# ADD LINK32 ..\network_io\win32\Debug ..\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 ..\network_io\win32\Debug\network_io.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 /machine:I386 +# ADD LINK32 ..\network_io\win32\Debug ..\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 ..\network_io\win32\Debug\network_io.lib ..\locks\win32\Debug\locks.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 /machine:I386 !ELSEIF "$(CFG)" == "testsock - Win32 Debug" @@ -66,7 +66,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.2 +3 -2 apache-apr/apr/test/testthread.dsp Index: testthread.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/testthread.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testthread.dsp 1999/08/04 19:42:33 1.1 +++ testthread.dsp 1999/08/08 21:19:54 1.2 @@ -51,7 +51,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 /machine:I386 -# ADD LINK32 ..\network_io\win32\Debug\network_io.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 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 /machine:I386 +# ADD LINK32 ..\network_io\win32\Debug\network_io.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 ..\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 /machine:I386 !ELSEIF "$(CFG)" == "testthread - Win32 Debug" @@ -67,7 +67,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.5 +3 -2 apache-apr/apr/test/timetest.dsp Index: timetest.dsp =================================================================== RCS file: /home/cvs/apache-apr/apr/test/timetest.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- timetest.dsp 1999/06/29 15:52:12 1.4 +++ timetest.dsp 1999/08/08 21:19:54 1.5 @@ -50,7 +50,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 /machine:I386 -# 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 ..\network_io\win32\Debug\network_io.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 /machine:I386 +# 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 ..\network_io\win32\Debug\network_io.lib ..\locks\win32\Debug\locks.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 /machine:I386 !ELSEIF "$(CFG)" == "timetest - Win32 Debug" @@ -66,7 +66,8 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe 1.1 apache-apr/apr/test/ab_apr.dsp Index: ab_apr.dsp =================================================================== # Microsoft Developer Studio Project File - Name="ab_apr" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=ab_apr - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "ab_apr.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "ab_apr.mak" CFG="ab_apr - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ab_apr - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "ab_apr - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "ab_apr - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 /machine:I386 # 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 /machine:I386 !ELSEIF "$(CFG)" == "ab_apr - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ab_apr__" # PROP BASE Intermediate_Dir "ab_apr__" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ab_apr" # PROP Intermediate_Dir "ab_apr" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /Fr /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 !ENDIF # Begin Target # Name "ab_apr - Win32 Release" # Name "ab_apr - Win32 Debug" # Begin Source File SOURCE=.\ab_apr.c # End Source File # End Target # End Project 1.1 apache-apr/apr/test/testarg.dsp Index: testarg.dsp =================================================================== # Microsoft Developer Studio Project File - Name="testarg" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=testarg - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "testarg.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "testarg.mak" CFG="testarg - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "testarg - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "testarg - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "testarg - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 /machine:I386 # 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 /machine:I386 !ELSEIF "$(CFG)" == "testarg - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "testarg_" # PROP BASE Intermediate_Dir "testarg_" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "testarg" # PROP Intermediate_Dir "testarg" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 !ENDIF # Begin Target # Name "testarg - Win32 Release" # Name "testarg - Win32 Debug" # Begin Source File SOURCE=.\testargs.c # End Source File # End Target # End Project 1.4 +19 -0 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- time.c 1999/07/06 17:37:08 1.3 +++ time.c 1999/08/08 21:20:03 1.4 @@ -137,3 +137,22 @@ return APR_SUCCESS; } +ap_status_t ap_timediff(struct atime_t *a, struct atime_t *b, ap_int32_t *rv) +{ + FILETIME fa, fb; + LONGLONG ia = 0, ib = 0; + + SystemTimeToFileTime(a->explodedtime, &fa); + SystemTimeToFileTime(b->explodedtime, &fb); + + ia = fa.dwHighDateTime; + ia = ia << 32; + ia |= fa.dwLowDateTime; + + ib = fb.dwHighDateTime; + ib = ib << 32; + ib |= fb.dwLowDateTime; + + *rv = (int)((ia - ib) / 1000000); + return APR_SUCCESS; +} \ No newline at end of file 1.4 +2 -1 apache-apr/apr/time/win32/time.def Index: time.def =================================================================== RCS file: /home/cvs/apache-apr/apr/time/win32/time.def,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- time.def 1999/07/02 19:09:28 1.3 +++ time.def 1999/08/08 21:20:04 1.4 @@ -26,4 +26,5 @@ ap_set_wday @19 ap_get_timedata @20 ap_set_timedata @21 - ap_get_os_time @22 \ No newline at end of file + ap_get_os_time @22 + ap_timediff @23 \ No newline at end of file 1.25 +15 -5 apache-apr/include/apr_general.h Index: apr_general.h =================================================================== RCS file: /home/cvs/apache-apr/include/apr_general.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- apr_general.h 1999/07/27 17:58:38 1.24 +++ apr_general.h 1999/08/08 21:20:05 1.25 @@ -53,7 +53,10 @@ * */ -#ifndef WIN32 +#ifdef WIN32 +#include "apr_win.h" +#include <windows.h> +#else #include "apr_config.h" #endif @@ -72,10 +75,6 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef WIN32 -#include "apr_win.h" -#include <windows.h> -#endif #include "apr_errno.h" #ifndef APR_GENERAL_H @@ -109,10 +108,17 @@ #elif (SIZEOF_LONG_DOUBLE == 8) typedef long double ap_int64_t; typedef unsigned long double ap_uint64_t; +#elif (SIZEOF_LONGLONG == 8) +typedef LONGLONG ap_int64_t; +typedef ULONGLONG ap_uint64_t; #endif typedef size_t ap_size_t; +#ifdef ssize_t typedef ssize_t ap_ssize_t; +#else +typedef int ap_ssize_t; +#endif typedef off_t ap_off_t; typedef struct context_t ap_context_t; @@ -209,7 +215,11 @@ #define APR_SIGIO SIGIO #endif +#ifdef WIN32 +#define APR_INLINE __inline +#else #define APR_INLINE inline +#endif /* Context functions */ ap_status_t ap_create_context(ap_context_t *, void *, ap_context_t **); 1.5 +1 -0 apache-apr/include/apr_time.h Index: apr_time.h =================================================================== RCS file: /home/cvs/apache-apr/include/apr_time.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apr_time.h 1999/06/22 16:57:38 1.4 +++ apr_time.h 1999/08/08 21:20:05 1.5 @@ -75,6 +75,7 @@ /* accessor functions */ ap_status_t ap_get_curtime(ap_time_t *, ap_int64_t *); +ap_status_t ap_timediff(ap_time_t *, ap_time_t *, ap_int32_t *); ap_status_t ap_get_sec(ap_time_t *, ap_int32_t *); ap_status_t ap_get_min(ap_time_t *, ap_int32_t *);