Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 93043 invoked from network); 9 Nov 2001 01:35:40 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 9 Nov 2001 01:35:40 -0000 Received: (qmail 24653 invoked by uid 97); 8 Nov 2001 23:03:10 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 24598 invoked by uid 97); 8 Nov 2001 23:03:09 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 24587 invoked by uid 97); 8 Nov 2001 23:03:08 -0000 Date: 8 Nov 2001 22:51:12 -0000 Message-ID: <20011108225112.18014.qmail@icarus.apache.org> From: mmanders@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_env.c jk_registry.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N mmanders 01/11/08 14:51:12 Modified: jk/native/common jk_env.c jk_registry.c Log: Cast some of the function pointers so that they will build when using MetroWerks CodeWarrior 6 (NetWare). Revision Changes Path 1.2 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_env.c Index: jk_env.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_env.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_env.c 2001/11/05 23:19:28 1.1 +++ jk_env.c 2001/11/08 22:51:12 1.2 @@ -88,8 +88,8 @@ static jk_env_initEnv( jk_env_t *env, char *id ) { /* env->logger=NULL; */ /* map_alloc( & env->properties ); */ - env->getFactory= jk_env_getFactory; - env->registerFactory= jk_env_registerFactory; + env->getFactory= (void *)jk_env_getFactory; + env->registerFactory= (void *)jk_env_registerFactory; map_alloc( & env->_registry); jk_registry_init(env); 1.3 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_registry.c Index: jk_registry.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_registry.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_registry.c 2001/11/07 21:40:59 1.2 +++ jk_registry.c 2001/11/08 22:51:12 1.3 @@ -62,7 +62,7 @@ /*************************************************************************** * Description: Worker list * - * Version: $Revision: 1.2 $ * + * Version: $Revision: 1.3 $ * ***************************************************************************/ /** Static declarations for all 'hardcoded' modules. This is a hack, @@ -116,11 +116,11 @@ printf("jk_registry_init: Assertion failed, env==NULL\n" ); return; } - env->registerFactory( env, "worker", "ajp13", &ajp13_worker_factory ); - env->registerFactory( env, "worker", "ajp14", &ajp14_worker_factory ); - env->registerFactory( env, "worker", "lb", &lb_worker_factory ); + env->registerFactory( env, "worker", "ajp13", (void *)&ajp13_worker_factory ); + env->registerFactory( env, "worker", "ajp14", (void *)&ajp14_worker_factory ); + env->registerFactory( env, "worker", "lb", (void *)&lb_worker_factory ); #ifdef HAVE_JNI - env->registerFactory( env, "worker", "jni", &jni_worker_factory ); + env->registerFactory( env, "worker", "jni", (void *)&jni_worker_factory ); #endif /* -- To unsubscribe, e-mail: For additional commands, e-mail: