You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ak...@locus.apache.org on 2000/03/15 17:33:03 UTC
cvs commit: apache-2.0/src/os/win32 main_win32.c
ake 00/03/15 08:33:03
Modified: src/lib/apr/misc/win32 getopt.c
src/os/win32 main_win32.c
Log:
Get Win32 working again after ap_getopt order changes.
Revision Changes Path
1.3 +1 -2 apache-2.0/src/lib/apr/misc/win32/getopt.c
Index: getopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/getopt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getopt.c 1999/11/22 14:52:15 1.2
+++ getopt.c 2000/03/15 16:33:02 1.3
@@ -63,8 +63,7 @@
* 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)
+ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct context_t *cont)
{
char *p;
static char *place = EMSG; /* option letter processing */
1.9 +1 -1 apache-2.0/src/os/win32/main_win32.c
Index: main_win32.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- main_win32.c 2000/03/10 00:07:32 1.8
+++ main_win32.c 2000/03/15 16:33:03 1.9
@@ -203,7 +203,7 @@
}
/* Munch away at the command line arguments... */
- while (ap_getopt(pwincmd, argc, argv, "n:k:iuC:c:d:f:vVlLth?", &c) == APR_SUCCESS) {
+ while (ap_getopt(argc, argv, "n:k:iuC:c:d:f:vVlLth?", &c, pwincmd) == APR_SUCCESS) {
switch (c) {
case 'k':
signal = ap_optarg;