apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: apr/include apr.hnw
Date Mon, 02 Dec 2002 21:16:46 GMT
bnicholes    2002/12/02 13:16:46

  Modified:    misc/netware libprews.c
               include/arch/netware apr_private.h
               include  apr.hnw
  Log:
  Moving the application global data management structure to APR.hnw to
  give it a wider scope.  This needs to be done to handle the per-application
  global data in the apr_util hook APIs.
  
  Revision  Changes    Path
  1.8       +3 -7      apr/misc/netware/libprews.c
  
  Index: libprews.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/netware/libprews.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- libprews.c	24 Jul 2002 14:35:43 -0000	1.7
  +++ libprews.c	2 Dec 2002 21:16:45 -0000	1.8
  @@ -15,13 +15,6 @@
   
   #include "apr_pools.h"
   
  -#define MAX_PROCESSORS         128
  -
  -typedef struct app_data {
  -    int     initialized;
  -    void*   gPool[MAX_PROCESSORS];
  -    void*   statCache[MAX_PROCESSORS];
  -} APP_DATA;
   
   /* library-private data...*/
   int          gLibId = -1;
  @@ -216,3 +209,6 @@
   
       return NULL;
   }
  +
  +
  +
  
  
  
  1.15      +0 -4      apr/include/arch/netware/apr_private.h
  
  Index: apr_private.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/netware/apr_private.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_private.h	7 Nov 2002 19:50:24 -0000	1.14
  +++ apr_private.h	2 Dec 2002 21:16:45 -0000	1.15
  @@ -160,10 +160,6 @@
   
   void netware_pool_proc_cleanup ();
   
  -// library-private data...
  -extern int  gLibId;
  -extern void *gLibHandle;
  -
   /* NLM registration routines for managing which NLMs
       are using the library. */
   int register_NLM(void *NLMHandle);
  
  
  
  1.23      +18 -3     apr/include/apr.hnw
  
  Index: apr.hnw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hnw,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- apr.hnw	3 Sep 2002 16:29:35 -0000	1.22
  +++ apr.hnw	2 Dec 2002 21:16:45 -0000	1.23
  @@ -344,9 +344,24 @@
   #define APR_TIME_T_FMT APR_INT64_T_FMT
   
   /* Deal with atoi64 variables ... these should move to apr_private.h */
  -/* I don't have the answer, perhaps a NetWare hacker will fill this in? */
  -#define APR_HAVE_INT64_STRFN  0
  -#define APR_INT64_STRFN	      missing
  +#define APR_HAVE_INT64_STRFN  1
  +#define APR_INT64_STRFN	      strtoll
  +
  +/* Application global data management */
  +extern int  gLibId;
  +extern void *gLibHandle;
  +
  +#define MAX_PROCESSORS         128
  +
  +typedef struct app_data {
  +    int     initialized;
  +    void*   gPool[MAX_PROCESSORS];
  +    void*   statCache[MAX_PROCESSORS];
  +    void*   gs_aHooksToSort;
  +    void*   gs_phOptionalHooks;
  +    void*   gs_phOptionalFunctions;
  +} APP_DATA;
  +
   
   #endif /* APR_H */
   /** @} */
  
  
  

Mime
View raw message