costin 02/05/22 16:42:32
Modified: jk/native2/include jk_pool.h
jk/native2/common jk_pool_apr.c
jk/native2/server/apache2 jk_apache2.h
Log:
The pool must be constructed before anything else, so we need to add a declaration
for the constructor ( we can't use env and factories ). I also added JK_METHOD
and made few changes ( mostly to get the windwos build )
Revision Changes Path
1.7 +4 -1 jakarta-tomcat-connectors/jk/native2/include/jk_pool.h
Index: jk_pool.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_pool.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_pool.h 21 Feb 2002 11:15:51 -0000 1.6
+++ jk_pool.h 22 May 2002 23:42:32 -0000 1.7
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Memory Pool object header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***************************************************************************/
#ifndef _JK_POOL_H
#define _JK_POOL_H
@@ -160,6 +160,9 @@
XXX move this to the factory
*/
int jk2_pool_create( struct jk_env *env, jk_pool_t **newPool, jk_pool_t *parent,
int size );
+
+int JK_METHOD jk2_pool_apr_create( struct jk_env *env, struct jk_pool **newPool,
+ struct jk_pool *parent, void *aprPool );
#ifdef __cplusplus
1.5 +3 -4 jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c
Index: jk_pool_apr.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_pool_apr.c 16 May 2002 23:48:27 -0000 1.4
+++ jk_pool_apr.c 22 May 2002 23:42:32 -0000 1.5
@@ -80,8 +80,6 @@
*/
-int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
- apr_pool_t *aprPool );
/** Nothing - apache will take care ??
*/
static void jk2_pool_apr_close(jk_env_t *env, jk_pool_t *p)
@@ -173,10 +171,11 @@
}
-int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
- apr_pool_t *aprPool)
+int JK_METHOD jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t
*parent,
+ void *aprPoolV)
{
jk_pool_t *_this;
+ apr_pool_t *aprPool=(apr_pool_t *)aprPoolV;
_this=(jk_pool_t *)apr_palloc(aprPool, sizeof( jk_pool_t ));
*newPool = _this;
1.8 +1 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h
Index: jk_apache2.h
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_apache2.h 14 May 2002 20:44:21 -0000 1.7
+++ jk_apache2.h 22 May 2002 23:42:32 -0000 1.8
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.7 $
+ * Version: $Revision: 1.8 $
*/
#include "jk_global.h"
@@ -84,10 +84,6 @@
int JK_METHOD jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
const char *type, const char *name);
-
-/* Temp. - we should use the factory ( we may need few changes ) */
-int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
- apr_pool_t *aprPool);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
