httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@lnd.com>
Subject RE: [PATCH] silly windows stuff for one or both Bills to look at
Date Fri, 28 Apr 2000 14:32:29 GMT
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 :-)

> -----Original Message-----
> From: Jeff Trawick [mailto:trawickj@bellsouth.net]
> Sent: Friday, April 28, 2000 9:24 AM
> To: new-httpd@apache.org
> Subject: [PATCH] silly windows stuff for one or both Bills to look at
> 
> 
> The changes I really want somebody to check out before I commit are
> those involving API_VAR_IMPORT->API_VAR_EXPORT.  Hopefully I didn't
> miss the big picture on what was supposed to happen.
> 
> The required workspace and project changes should have been committed
> last night; I guess I didn't save :(  (I'm learning proper
> IDE/workspace/project procedures now; normally I prefer nmake but
> perhaps when I get it down pat I'll be happier in the IDE.)
> 
> There is also the ap_signal() problem to solve for htdigest (no
> ap_signal() for Win32 apparently?).  I haven't looked into it yet to
> know for sure.
> 
> Thanks!
> 
> Index: Apache.dsw
> ===================================================================
> RCS file: /cvs/apache/apache-2.0/src/Apache.dsw,v
> retrieving revision 1.8
> diff -r1.8 Apache.dsw
> 337a338,343
> >     Begin Project Dependency
> >     Project_Dep_Name ap
> >     End Project Dependency
> >     Begin Project Dependency
> >     Project_Dep_Name aprlib
> >     End Project Dependency
> Index: lib/apr/include/apr_getopt.h
> ===================================================================
> RCS file: /cvs/apache/apache-2.0/src/lib/apr/include/apr_getopt.h,v
> retrieving revision 1.8
> diff -r1.8 apr_getopt.h
> 58c58
> < API_VAR_IMPORT int
> ---
> > API_VAR_EXPORT int
> 63c63
> < API_VAR_IMPORT char *
> ---
> > API_VAR_EXPORT char *
> Index: lib/apr/include/apr_time.h
> ===================================================================
> RCS file: /cvs/apache/apache-2.0/src/lib/apr/include/apr_time.h,v
> retrieving revision 1.18
> diff -r1.18 apr_time.h
> 65,66c65,66
> < API_VAR_IMPORT const char ap_month_snames[12][4];
> < API_VAR_IMPORT const char ap_day_snames[7][4];
> ---
> > API_VAR_EXPORT const char ap_month_snames[12][4];
> > API_VAR_EXPORT const char ap_day_snames[7][4];
> 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 -r1.7 getopt.c
> 39c39,40
> < int ap_opterr = 1,                      /* if error message 
> should be printed */
> ---
> > API_VAR_EXPORT int
> >     ap_opterr = 1,                      /* if error message 
> should be printed */
> 43c44,45
> < char *ap_optarg = "";                   /* argument 
> associated with option */
> ---
> > API_VAR_EXPORT char *
> >     ap_optarg = "";                     /* argument 
> associated with option */
> Index: support/ab.c
> ===================================================================
> RCS file: /cvs/apache/apache-2.0/src/support/ab.c,v
> retrieving revision 1.10
> diff -r1.10 ab.c
> 165,166d164
> < API_VAR_IMPORT char *ap_optarg; /* argument associated with 
> option */
> < API_VAR_IMPORT int  ap_optind;
> 1074c1072
> <     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 -r1.1 ab.dsp
> 20,21c20
> < !MESSAGE "ab - Win32 Release" (based on\
> <  "Win32 (x86) Console Application")
> ---
> > !MESSAGE "ab - Win32 Release" (based on "Win32 (x86) 
> Console Application")
> 45,46c44
> < # 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
> Index: support/htdigest.dsp
> ===================================================================
> RCS file: /cvs/apache/apache-2.0/src/support/htdigest.dsp,v
> retrieving revision 1.3
> diff -r1.3 htdigest.dsp
> 45,46c45
> < # 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
> 
> 
> -- 
> 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