cvs commit: apr-util/hooks apr_hooks.c

[wrowe]

wrowe       01/01/27 11:03:29

  Modified:    include  apr_optional.h
               hooks    apr_hooks.c
  Log:
    Not sure what all the private stuff is doing in the header... but heck,
    this makes it all compile on win32.
  
  Revision  Changes    Path
  1.2       +5 -3      apr-util/include/apr_optional.h
  
  Index: apr_optional.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_optional.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_optional.h    2001/01/27 17:50:49     1.1
  +++ apr_optional.h    2001/01/27 19:03:28     1.2
  @@ -72,8 +72,10 @@
   #define APR_DECLARE_OPTIONAL_FN(ret,name,args) \
   typedef ret APR_OPTIONAL_FN_TYPE(name) args;
   
  -/* Private function! DO NOT USE! */
  -void apr_register_optional_fn(const char *szName,void (*pfn)(void));
  +/* XXX: This doesn't belong here, then!
  + * Private function! DO NOT USE! 
  + */
  +APU_DECLARE_NONSTD(void) apr_register_optional_fn(const char *szName,void 
(*pfn)(void));
   
   /**
    * Register an optional function. This can be later retrieved, type-safely, 
by
  @@ -85,7 +87,7 @@
        ((void (*)(const char *,APR_OPTIONAL_FN_TYPE(name) 
*))&apr_register_optional_fn)(#name,name)
   
   /* Private function! DO NOT USE! */
  -void (*apr_retrieve_optional_fn(const char *szName))(void);
  +APU_DECLARE_DATA void (*apr_retrieve_optional_fn(const char *szName))(void);
   
   /**
    * Retrieve an optional function. Returns NULL if the function is not 
present.
  
  
  
  1.33      +3 -3      apr-util/hooks/apr_hooks.c
  
  Index: apr_hooks.c
  ===================================================================
  RCS file: /home/cvs/apr-util/hooks/apr_hooks.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- apr_hooks.c       2001/01/27 17:50:48     1.32
  +++ apr_hooks.c       2001/01/27 19:03:29     1.33
  @@ -332,7 +332,7 @@
   
   /* optional function support */
   
  -void (*apr_retrieve_optional_fn(const char *szName))(void)
  +APU_DECLARE_DATA void (*apr_retrieve_optional_fn(const char *szName))(void)
   {
       void (*pfn)(void);
   
  @@ -341,8 +341,8 @@
       return apr_hash_get(s_phOptionalFunctions,szName,strlen(szName));
   }
   
  -APU_DECLARE(void) apr_register_optional_fn(const char *szName,
  -                                        void (*pfn)(void))
  +APU_DECLARE_NONSTD(void) apr_register_optional_fn(const char *szName,
  +                                                  void (*pfn)(void))
   {
       if(!s_phOptionalFunctions)
        s_phOptionalFunctions=apr_make_hash(apr_global_hook_pool);