Re: svn commit: r378394 - /httpd/httpd/trunk/modules/aaa/mod_auth.h

[Brad Nicholes <BN...@novell.com>]

>>> On 2/17/2006 at 11:22:44 am, in message <43...@apache.org>,
rpluem@apache.org wrote:

> 
> On 02/17/2006 12:28 AM, dreid@apache.org wrote:
> 
>> 
>> Modified: httpd/httpd/trunk/modules/aaa/mod_auth.h
>> URL: 
> http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth.h?rev=37 
> 8394&r1=378393&r2=378394&view=diff
>> 
> =============================================================================
> =
>> --- httpd/httpd/trunk/modules/aaa/mod_auth.h (original)
>> +++ httpd/httpd/trunk/modules/aaa/mod_auth.h Thu Feb 16 15:28:44 2006
>> @@ -54,6 +54,8 @@
>>  
>>  APR_DECLARE_OPTIONAL_FN(int, ap_satisfies, (request_rec *r));
>>  
>> +extern APR_OPTIONAL_FN_TYPE(ap_satisfies) *ap_satisfies;
>> +
>>  typedef enum {
>>      AUTH_DENIED,
>>      AUTH_GRANTED,
>> 
> 
> -1
> 
> This breaks compilation of the trunk on my box after a make clean with the 
> following error message:
> 
> /usr/src/apache/httpd-trunk/srclib/apr/libtool --silent --mode=compile gcc 
> -g -O2 -pthread    -DLINUX=2 -D_REENTRANT
> -D_GNU_SOURCE -D_LARGEFILE64_SOURCE    
> -I/usr/src/apache/httpd-trunk/srclib/pcre -I.
> -I/usr/src/apache/httpd-trunk/os/unix 
> -I/usr/src/apache/httpd-trunk/server/mpm/worker
> -I/usr/src/apache/httpd-trunk/modules/http 
> -I/usr/src/apache/httpd-trunk/modules/filters
> -I/usr/src/apache/httpd-trunk/modules/proxy 
> -I/usr/src/apache/httpd-trunk/include
> -I/usr/src/apache/httpd-trunk/modules/generators 
> -I/usr/src/apache/httpd-trunk/modules/mappers
> -I/usr/src/apache/httpd-trunk/modules/database 
> -I/usr/src/apache/httpd-trunk/srclib/apr/include
> -I/usr/src/apache/httpd-trunk/srclib/apr-util/include 
> -I/usr/src/apache/httpd-trunk/server
> -I/usr/src/apache/httpd-trunk/modules/proxy/../generators 
> -I/usr/src/apache/httpd-trunk/modules/ssl
> -I/usr/src/apache/httpd-trunk/modules/dav/main -prefer-pic -c 
> mod_access_compat.c && touch mod_access_compat.slo
> mod_access_compat.c:311: `ap_satisfies' redeclared as different kind of 
> symbol
> mod_auth.h:57: previous declaration of `ap_satisfies'
> make[4]: *** [mod_access_compat.slo] Fehler 1
> make[4]: Verlassen des Verzeichnisses 
> »/usr/src/apache/httpd-trunk/modules/aaa«
> make[3]: *** [shared-build-recursive] Fehler 1
> make[3]: Verlassen des Verzeichnisses 
> »/usr/src/apache/httpd-trunk/modules/aaa«
> make[2]: *** [shared-build-recursive] Fehler 1
> make[2]: Verlassen des Verzeichnisses »/usr/src/apache/httpd-trunk/modules«
> make[1]: *** [shared-build-recursive] Fehler 1
> make[1]: Verlassen des Verzeichnisses »/usr/src/apache/httpd-trunk«
> make: *** [all-recursive] Fehler 1
> 
> Configure I used:
> 
> ./configure --prefix=/usr/src/apache/apache_trunk --with-mpm=worker 
> --enable-so --enable-mods-shared=all --enable-proxy
> --enable-proxy-balancer --enable-cache --enable-disk-cache 
> --enable-mem-cache --enable-dumpio --enable-proxy-connect
> --enable-proxy-ftp --enable-proxy-http --enable-proxy-ajp --enable-ssl 
> --enable-dav-fs --enable-dav --enable-dav-lock
> --enable-rewrite --enable-authnz-ldap --enable-ldap --with-ldap
> 
> Reverting it, makes it work again.
> 
> So please revert or fix.
> 
> Regards
> 
> Rüdige

The APR_OPTIONAL_FN_TYPE() macro should be place within the .c file that is importing the optional function.  See an example for importing ap_satisfies() in mod_authz_default.c

Brad