httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <trawi...@bellsouth.net>
Subject Re: [PATCH] silly windows stuff for one or both Bills to look at
Date Fri, 28 Apr 2000 14:53:29 GMT
> From: "William A. Rowe, Jr." <wrowe@lnd.com>
...
> I see several problems... but I would prefer -unified diff of 3 lines,
> please!?!  You can't state export in an included file that consumes the
> external dll, for one!
> 
> But don't let import/export hold up your htdigest/ab work!  And the
> getopt.c stuff looks good (NOT the .h, however!)
> 
> Leave out changing the .h import/export stuff, since that will be
> radically overhauled -after- the alpha.  Stuff in public headers,
> today, is IMPORT, stuff in .c code is EXPORT, and we live with the
> compiler emits till I can do the whole shootin match correctly :-)

Oops...  (~/.cvsrc fixed on Win32 now to give unified diffs by default
:) )  Here is a new diff that should be more appealing...

Thanks for the quick response!

Index: Apache.dsw
===================================================================
RCS file: /cvs/apache/apache-2.0/src/Apache.dsw,v
retrieving revision 1.8
diff -u -r1.8 Apache.dsw
--- Apache.dsw	2000/04/28 08:30:19	1.8
+++ Apache.dsw	2000/04/28 14:46:12
@@ -335,6 +335,12 @@
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ap
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprlib
+    End Project Dependency
 }}}
 
 ###############################################################################
Index: lib/apr/misc/win32/getopt.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/misc/win32/getopt.c,v
retrieving revision 1.7
diff -u -r1.7 getopt.c
--- getopt.c	2000/04/14 15:58:33	1.7
+++ getopt.c	2000/04/28 14:46:13
@@ -36,11 +36,13 @@
 #include <string.h>
 #include "misc.h"
 
-int ap_opterr = 1,                      /* if error message should be printed */
+API_VAR_EXPORT int
+    ap_opterr = 1,                      /* if error message should be printed */
     ap_optind = 1,                      /* index into parent argv vector */
     ap_optopt,                          /* character checked for validity */
     ap_optreset;                        /* reset getopt */
-char *ap_optarg = "";                   /* argument associated with option */
+API_VAR_EXPORT char *
+    ap_optarg = "";                     /* argument associated with option */
 
 #define EMSG    ""
 
Index: support/ab.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/support/ab.c,v
retrieving revision 1.10
diff -u -r1.10 ab.c
--- ab.c	2000/04/28 01:37:42	1.10
+++ ab.c	2000/04/28 14:46:16
@@ -162,8 +162,6 @@
 #define ap_max(a,b) ((a)>(b))?(a):(b)
 
 /* --------------------- GLOBALS ---------------------------- */
-API_VAR_IMPORT char *ap_optarg; /* argument associated with option */
-API_VAR_IMPORT int  ap_optind;
 
 int verbosity = 0;        	/* no verbosity by default */
 int posting = 0;        	/* GET by default */
@@ -1071,5 +1069,5 @@
     copyright();
     test();
 
-    exit(0);
+    return 0;
 }
Index: support/ab.dsp
===================================================================
RCS file: /cvs/apache/apache-2.0/src/support/ab.dsp,v
retrieving revision 1.1
diff -u -r1.1 ab.dsp
--- ab.dsp	2000/04/28 01:37:42	1.1
+++ ab.dsp	2000/04/28 14:46:16
@@ -17,8 +17,7 @@
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ab - Win32 Release" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "ab - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "ab - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
@@ -42,8 +41,7 @@
 # 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 /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\lib\apr\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
Index: support/htdigest.dsp
===================================================================
RCS file: /cvs/apache/apache-2.0/src/support/htdigest.dsp,v
retrieving revision 1.3
diff -u -r1.3 htdigest.dsp
--- htdigest.dsp	2000/04/25 21:18:03	1.3
+++ htdigest.dsp	2000/04/28 14:46:16
@@ -42,8 +42,7 @@
 # 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 /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\lib\apr\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe



-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Mime
View raw message