mmanders 01/11/26 11:36:15
Modified: jk/native/common jk_registry.c
Log:
Added casts necessary to build for NetWare since the worker_factory functions
currently being used don't match the prototype of the registerFactory method. The
MetroWerks compiler treats this as an error instead of just a warning.
Revision Changes Path
1.9 +12 -6 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_registry.c 2001/11/26 17:08:17 1.8
+++ jk_registry.c 2001/11/26 19:36:15 1.9
@@ -62,7 +62,7 @@
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -129,14 +129,20 @@
printf("jk_registry_init: Assertion failed, env==NULL\n" );
return;
}
+ /**
+ * Because the functions being referenced here (apjp14_work_factory, and
+ * lb_worker_factory) don't match the prototype declared for registerFactory,
+ * and because the MetroWerks compiler (used for NetWare) treats this as an
+ * error, I'm casting the function pointers to (void *) - mmanders
+ */
#ifdef AJP12
- env->registerFactory( env, "worker", "ajp12", &ajp12_worker_factory );
+ env->registerFactory( env, "worker", "ajp12", (void *) &ajp12_worker_factory );
#endif
- env->registerFactory( env, "worker", "ajp13", &ajp14_worker_factory );
- env->registerFactory( env, "worker", "ajp14", &ajp14_worker_factory );
- env->registerFactory( env, "worker", "lb", &lb_worker_factory );
+ env->registerFactory( env, "worker", "ajp13", (void *) &ajp14_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
env->registerFactory( env, "channel", "socket", &jk_channel_socket_factory );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
