You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/01/28 19:26:39 UTC

cvs commit: httpd-2.0/include ap_compat.h

wrowe       01/01/28 10:26:38

  Added:       include  ap_compat.h
  Log:
    Another starting point, by no means complete.
  
  Revision  Changes    Path
  1.1                  httpd-2.0/include/ap_compat.h
  
  Index: ap_compat.h
  ===================================================================
  #ifndef APR_COMPAT_H
  #define APR_COMPAT_H
  
  /* Drag in apu (and therefore apr) renamed symbols */
  #include "apu_compat.h"
  
  /* redefine 1.3.x symbols to the new symbol names */
  
  #define MODULE_VAR_EXPORT    AP_MODULE_DECLARE_DATA
  
  #endif /* APR_COMPAT_H */
  
  

RE: cvs commit: httpd-2.0/include ap_compat.h

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
[Moved from new-httpd@apache.org]

> From: Ben Laurie [mailto:ben@algroup.co.uk]
> Sent: Monday, January 29, 2001 8:32 AM
> 
> "William A. Rowe, Jr." wrote:
> > 
> > > From: Ben Laurie [mailto:ben@algroup.co.uk]
> > > Sent: Monday, January 29, 2001 3:53 AM
> > >
> > > Greg Stein wrote:
> > > >
> > > > These should all have license text at the top.
> > >
> > > BTW, what's the deal with the "apu_" prefix?
> > 
> > Just avoiding namespace clashes.  Could be wordy and rename 
> it apr_util_compat.h
> > if you like.  Each includes the headers[s] below it, since 
> each depends on the
> > projects following anyways;
> > 
> > httpd-2.0/include/ap_compat [renamed 1.3/2.0a symbol names 
> in the server]
> > 
> >   apr-util/include/apu_compat.h [renamed 1.3/2.0a symbol 
> names in apr-util]
> > 
> >     apr/include/apr_compat.h [renamed old 1.3/2.0a  symbol 
> names apr -only-]
> 
> Ah, so:
> 
> ap_ -> Apache
> 
> apu_ -> APR-utils
> 
> apr_ -> APR
> 
> ? This doesn't seem consistent with actual usage, sadly - for example,
> hooks are APR_ but live in apr-utils.

No, it is consistent, c.f. apu.h.  Let me provide a definition that we 
can incorporate into the project STATUS or some other file... for each tree:

apr 
---
All external Apache Portablility Runtime symbols must be namespace protected
with the apr_ prefix (or APR_ in the case of macros.)

apr-util
--------
External APR Utility symbols must be namespace protected, usually with the 
apr_ prefix (or APR_ in the case of macros.)  The exception to this are 
namespace clashes with apr itself.  In those cases, the apu_ prefix (or
APU_ in the case of macros) is used instead.



Re: cvs commit: httpd-2.0/include ap_compat.h

Posted by Ben Laurie <be...@algroup.co.uk>.
"William A. Rowe, Jr." wrote:
> 
> > From: Ben Laurie [mailto:ben@algroup.co.uk]
> > Sent: Monday, January 29, 2001 3:53 AM
> >
> > Greg Stein wrote:
> > >
> > > These should all have license text at the top.
> >
> > BTW, what's the deal with the "apu_" prefix?
> 
> Just avoiding namespace clashes.  Could be wordy and rename it apr_util_compat.h
> if you like.  Each includes the headers[s] below it, since each depends on the
> projects following anyways;
> 
> httpd-2.0/include/ap_compat [renamed 1.3/2.0a symbol names in the server]
> 
>   apr-util/include/apu_compat.h [renamed 1.3/2.0a symbol names in apr-util]
> 
>     apr/include/apr_compat.h [renamed old 1.3/2.0a  symbol names apr -only-]

Ah, so:

ap_ -> Apache

apu_ -> APR-utils

apr_ -> APR

? This doesn't seem consistent with actual usage, sadly - for example,
hooks are APR_ but live in apr-utils.

Cheers,

Ben.

--
http://www.apache-ssl.org/ben.html

"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff

RE: cvs commit: httpd-2.0/include ap_compat.h

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
> From: Ben Laurie [mailto:ben@algroup.co.uk]
> Sent: Monday, January 29, 2001 3:53 AM
> 
> Greg Stein wrote:
> > 
> > These should all have license text at the top.
> 
> BTW, what's the deal with the "apu_" prefix?

Just avoiding namespace clashes.  Could be wordy and rename it apr_util_compat.h
if you like.  Each includes the headers[s] below it, since each depends on the
projects following anyways;


httpd-2.0/include/ap_compat [renamed 1.3/2.0a symbol names in the server]

  apr-util/include/apu_compat.h [renamed 1.3/2.0a symbol names in apr-util] 

    apr/include/apr_compat.h [renamed old 1.3/2.0a  symbol names apr -only-]
  



Re: cvs commit: httpd-2.0/include ap_compat.h

Posted by Ben Laurie <be...@algroup.co.uk>.
Greg Stein wrote:
> 
> These should all have license text at the top.

BTW, what's the deal with the "apu_" prefix?

Cheers,

Ben.

> 
> Cheers,
> -g
> 
> On Sun, Jan 28, 2001 at 06:26:39PM -0000, wrowe@apache.org wrote:
> > wrowe       01/01/28 10:26:38
> >
> >   Added:       include  ap_compat.h
> >   Log:
> >     Another starting point, by no means complete.
> >
> >   Revision  Changes    Path
> >   1.1                  httpd-2.0/include/ap_compat.h
> >
> >   Index: ap_compat.h
> >   ===================================================================
> >   #ifndef APR_COMPAT_H
> >   #define APR_COMPAT_H
> >
> >   /* Drag in apu (and therefore apr) renamed symbols */
> >   #include "apu_compat.h"
> >
> >   /* redefine 1.3.x symbols to the new symbol names */
> >
> >   #define MODULE_VAR_EXPORT    AP_MODULE_DECLARE_DATA
> >
> >   #endif /* APR_COMPAT_H */
> >
> >
> 
> --
> Greg Stein, http://www.lyra.org/

--
http://www.apache-ssl.org/ben.html

"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff

Re: cvs commit: httpd-2.0/include ap_compat.h

Posted by Greg Stein <gs...@lyra.org>.
These should all have license text at the top.

Cheers,
-g

On Sun, Jan 28, 2001 at 06:26:39PM -0000, wrowe@apache.org wrote:
> wrowe       01/01/28 10:26:38
> 
>   Added:       include  ap_compat.h
>   Log:
>     Another starting point, by no means complete.
>   
>   Revision  Changes    Path
>   1.1                  httpd-2.0/include/ap_compat.h
>   
>   Index: ap_compat.h
>   ===================================================================
>   #ifndef APR_COMPAT_H
>   #define APR_COMPAT_H
>   
>   /* Drag in apu (and therefore apr) renamed symbols */
>   #include "apu_compat.h"
>   
>   /* redefine 1.3.x symbols to the new symbol names */
>   
>   #define MODULE_VAR_EXPORT    AP_MODULE_DECLARE_DATA
>   
>   #endif /* APR_COMPAT_H */
>   
>   

-- 
Greg Stein, http://www.lyra.org/