You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "William A. Rowe, Jr." <wr...@lnd.com> on 2000/06/28 06:31:11 UTC
RE: cvs commit: apache-2.0/src/lib/apr/include apr.hw apr_network_io.h apr_private.hw
> From: ake@locus.apache.org [mailto:ake@locus.apache.org]
> Sent: Thursday, June 22, 2000 2:10 PM
>
> ake 00/06/22 12:09:47
>
> Modified: src/lib/apr/include apr.hw apr_network_io.h apr_private.hw
> Log:
> Get Win32 building with yesterday's patch to make APR
> use APR namespace protected macros.
First off, this is verboten, can get you shot by a certain APR architect:
> 1.42 +1 -0 apache-2.0/src/lib/apr/include/apr_network_io.h
>
> Index: apr_network_io.h
> ===================================================================
> +#include "apr_private.h"
apr_private is NEVERNEVERNEVER allowed to pop up in anything but APR itself!
It must be backed out immediately.
> Index: apr.hw
> ===================================================================
> -#define APR_HAS_SENDFILE 1
> +#define APR_HAVE_SENDFILE 1
dieses ist nicht so gut... APR_HAVE_'s if I remember, are (were?) simply
defines, and APR_HAS_ gets a number (always) to test. But I was trying to
keep things is (relatively) the same order as things occur from apr.h.in
and apr_private.h.in ... if you are so motivated please feel free to walk
throught them together and resync them :)
> Index: apr_private.hw
> ===================================================================
> -#define HAVE_SENDFILE 1
I take it this is how we do things these days? Sorry, been out of the loop.
I noticed we are getting macro redefs... but I didn't stop to sort it out.
RE: cvs commit: apache-2.0/src/lib/apr/include apr.hw apr_network_io.h
apr_private.hw
Posted by rb...@covalent.net.
On Tue, 27 Jun 2000, William A. Rowe, Jr. wrote:
> > From: ake@locus.apache.org [mailto:ake@locus.apache.org]
> > Sent: Thursday, June 22, 2000 2:10 PM
> >
> > ake 00/06/22 12:09:47
> >
> > Modified: src/lib/apr/include apr.hw apr_network_io.h apr_private.hw
> > Log:
> > Get Win32 building with yesterday's patch to make APR
> > use APR namespace protected macros.
>
> First off, this is verboten, can get you shot by a certain APR architect:
>
> > 1.42 +1 -0 apache-2.0/src/lib/apr/include/apr_network_io.h
> >
> > Index: apr_network_io.h
> > ===================================================================
> > +#include "apr_private.h"
>
> apr_private is NEVERNEVERNEVER allowed to pop up in anything but APR itself!
> It must be backed out immediately.
+1! I missed that, and I'm not sure how.
>
> > Index: apr.hw
> > ===================================================================
> > -#define APR_HAS_SENDFILE 1
> > +#define APR_HAVE_SENDFILE 1
>
> dieses ist nicht so gut... APR_HAVE_'s if I remember, are (were?) simply
> defines, and APR_HAS_ gets a number (always) to test. But I was trying to
> keep things is (relatively) the same order as things occur from apr.h.in
> and apr_private.h.in ... if you are so motivated please feel free to walk
> throught them together and resync them :)
These were caused by mistakes on my part, and they should have been fixed
already.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
RE: cvs commit: apache-2.0/src/lib/apr/include apr.hw apr_network_io.h apr_private.hw
Posted by Allan Edwards <ak...@raleigh.ibm.com>.
> apache-2.0/src/lib/apr/include/apr_network_io.h
> >
> > Index: apr_network_io.h
> >
> ===================================================================
> > +#include "apr_private.h"
>
> apr_private is NEVERNEVERNEVER allowed to pop up in anything
> but APR itself!
That definitely shouldn't have been there. Not sure how
it crept in but it's gone now. Thanks.
> It must be backed out immediately.
>
> > Index: apr.hw
> >
> ===================================================================
> > -#define APR_HAS_SENDFILE 1
> > +#define APR_HAVE_SENDFILE 1
>
> dieses ist nicht so gut... APR_HAVE_'s if I remember, are
> (were?) simply
> defines, and APR_HAS_ gets a number (always) to test. But I
> was trying to
> keep things is (relatively) the same order as things occur
> from apr.h.in
> and apr_private.h.in ... if you are so motivated please feel
> free to walk
> throught them together and resync them :)
You've probably realized by now that this was the result
of a typo in the prior patch that broke the build and
has been corrected.
>
>
> > Index: apr_private.hw
> >
> ===================================================================
> > -#define HAVE_SENDFILE 1
>
> I take it this is how we do things these days? Sorry, been
> out of the loop.
> I noticed we are getting macro redefs... but I didn't stop to
> sort it out.
btw why do we duplicate APR feature macros in apr.hw
_and_ apr_private.hw?
Allan