costin 01/12/13 23:09:01 Modified: jk/native2/include jk_endpoint.h jk_env.h jk_uriMap.h jk_webapp.h jk_worker.h jk_workerEnv.h Log: Few changes to get it to compile. Using typedef'ed names is very strange in .h, I had to replace some with struct - the order and how the .h files are included seem to play a role. Probably there is a better solution, but I'm not a C programmer. Revision Changes Path 1.7 +5 -3 jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h Index: jk_endpoint.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_endpoint.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_endpoint.h 2001/12/13 19:06:11 1.6 +++ jk_endpoint.h 2001/12/14 07:09:01 1.7 @@ -61,7 +61,7 @@ * Author: Gal Shachor <[EMAIL PROTECTED]> * Author: Dan Milstein <[EMAIL PROTECTED]> * Author: Henri Gomez <[EMAIL PROTECTED]> - * Version: $Revision: 1.6 $ + * Version: $Revision: 1.7 $ ***************************************************************************/ #ifndef JK_ENDPOINT_H @@ -80,6 +80,8 @@ struct jk_endpoint; struct jk_ws_service; +struct jk_logger; +struct jk_map; typedef struct jk_endpoint jk_endpoint_t; /* @@ -177,7 +179,7 @@ */ int (JK_METHOD *service)(jk_endpoint_t *e, struct jk_ws_service *s, - jk_logger_t *l, + struct jk_logger *l, int *is_recoverable_error); /* @@ -194,7 +196,7 @@ * worker. */ int (JK_METHOD *done)(jk_endpoint_t **p, - jk_logger_t *l); + struct jk_logger *l); }; #ifdef __cplusplus 1.3 +4 -2 jakarta-tomcat-connectors/jk/native2/include/jk_env.h Index: jk_env.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_env.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_env.h 2001/12/06 22:48:49 1.2 +++ jk_env.h 2001/12/14 07:09:01 1.3 @@ -82,6 +82,8 @@ */ struct jk_pool; struct jk_env; +struct jk_logger; +struct jk_map; typedef struct jk_env jk_env_t; /** @@ -121,7 +123,7 @@ * the other methods parameters. */ struct jk_env { - jk_logger_t *logger; + struct jk_logger *logger; jk_pool_t *globalPool; /** Global properties ( similar with System properties in java) @@ -158,7 +160,7 @@ char *factorySymbol); /* private */ - jk_map_t *_registry; + struct jk_map *_registry; }; 1.6 +3 -2 jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h Index: jk_uriMap.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_uriMap.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_uriMap.h 2001/12/06 22:48:49 1.5 +++ jk_uriMap.h 2001/12/14 07:09:01 1.6 @@ -79,15 +79,16 @@ #define JK_URIMAP_H #include "jk_global.h" -#include "jk_map.h" #include "jk_logger.h" #include "jk_uriEnv.h" +#include "jk_map.h" #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ struct jk_uriMap; +struct jk_map; typedef struct jk_uriMap jk_uriMap_t; struct jk_uriMap { @@ -105,7 +106,7 @@ */ int (*init)( jk_uriMap_t *_this, struct jk_workerEnv *workerEnv, - jk_map_t *init_data ); + struct jk_map *init_data ); void (*destroy)( jk_uriMap_t *_this ); 1.2 +3 -2 jakarta-tomcat-connectors/jk/native2/include/jk_webapp.h Index: jk_webapp.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_webapp.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_webapp.h 2001/12/06 22:43:29 1.1 +++ jk_webapp.h 2001/12/14 07:09:01 1.2 @@ -81,6 +81,7 @@ struct jk_env; struct jk_uri_worker_map; struct jk_map; +struct jk_logger; struct jk_webapp; typedef struct jk_webapp jk_webapp_t; @@ -137,7 +138,7 @@ /** Different apps can have different loggers. */ - jk_logger_t *l; + struct jk_logger *l; /* SSL Support - you can fine tune this per application. * ( most likely you only do it per virtual host or globally ) @@ -157,7 +158,7 @@ /* Environment variables support */ int envvars_in_use; - jk_map_t * envvars; + struct jk_map *envvars; /* -------------------- Methods -------------------- */ 1.8 +8 -7 jakarta-tomcat-connectors/jk/native2/include/jk_worker.h Index: jk_worker.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_worker.h 2001/12/13 19:06:11 1.7 +++ jk_worker.h 2001/12/14 07:09:01 1.8 @@ -58,7 +58,7 @@ /*************************************************************************** * Description: Workers controller header file * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.7 $ * + * Version: $Revision: 1.8 $ * ***************************************************************************/ #ifndef JK_WORKER_H @@ -82,6 +82,7 @@ struct jk_env; struct jk_objCache; struct jk_msg; +struct jk_map; typedef struct jk_worker jk_worker_t; /* @@ -205,18 +206,18 @@ * You can skip this by setting it to NULL. */ int (JK_METHOD *validate)(jk_worker_t *_this, - jk_map_t *props, + struct jk_map *props, struct jk_workerEnv *we, - jk_logger_t *l); + struct jk_logger *l); /* * Do whatever initialization needs to be done to start this worker up. * Configuration options are passed in via the props parameter. */ int (JK_METHOD *init)(jk_worker_t *_this, - jk_map_t *props, + struct jk_map *props, struct jk_workerEnv *we, - jk_logger_t *l ); + struct jk_logger *l ); /* * Obtain an endpoint to service a particular request. A pointer to @@ -225,7 +226,7 @@ */ int (JK_METHOD *get_endpoint)(jk_worker_t *_this, struct jk_endpoint **pend, - jk_logger_t *l ); + struct jk_logger *l ); /* * Called when this particular endpoint has finished processing a @@ -241,7 +242,7 @@ /* * Shutdown this worker. */ - int (JK_METHOD *destroy)(jk_worker_t **_thisP, jk_logger_t *l ); + int (JK_METHOD *destroy)(jk_worker_t **_thisP, struct jk_logger *l ); }; #ifdef __cplusplus 1.6 +4 -3 jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h Index: jk_workerEnv.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_workerEnv.h 2001/12/12 22:02:08 1.5 +++ jk_workerEnv.h 2001/12/14 07:09:01 1.6 @@ -58,7 +58,7 @@ /*************************************************************************** * Description: Workers controller header file * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.5 $ * + * Version: $Revision: 1.6 $ * ***************************************************************************/ #ifndef JK_WORKERENV_H @@ -83,6 +83,7 @@ struct jk_uriMap; struct jk_webapp; struct jk_map; +struct jk_logger; struct jk_handler; struct jk_ws_service; @@ -144,7 +145,7 @@ /** Global logger for jk messages. Set at init. */ - jk_logger_t *l; + struct jk_logger *l; /* * Worker stuff @@ -189,7 +190,7 @@ * Environment variables support */ int envvars_in_use; - jk_map_t * envvars; + struct jk_map * envvars; /* Handlers. This is a dispatch table for messages, for * each message id we have an entry containing the jk_handler_t.
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>