Here's a patch for clean builds on MSVC6 - includes a couple of missing
headers, and adds JK_METHOD attributes to the neccesary functions
(otherwise calling conventions are declared differently, and you get
compilation-fatal errors).
Michael Smith
Index: jk_channel_socket.c
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/jk/native/common/jk_channel_
socket.c,v
retrieving revision 1.2
diff -u -r1.2 jk_channel_socket.c
--- jk_channel_socket.c 2001/11/16 22:48:55 1.2
+++ jk_channel_socket.c 2001/11/19 01:06:39
@@ -73,6 +73,8 @@
#include "jk_env.h"
#include "jk_channel.h"
#include "jk_global.h"
+#include "jk_util.h"
+#include "jk_connect.h"
#include <string.h>
@@ -110,13 +112,13 @@
static int jk_channel_socket_resolve(char *host, short port,
struct sockaddr_in *rc);
-static int jk_channel_socket_getProperty(jk_channel_t *_this,
+static int JK_METHOD jk_channel_socket_getProperty(jk_channel_t *_this,
char *name, char **value)
{
return JK_FALSE;
}
-static int jk_channel_socket_setProperty(jk_channel_t *_this,
+static int JK_METHOD jk_channel_socket_setProperty(jk_channel_t *_this,
char *name, char *value)
{
jk_channel_socket_private_t *socketInfo=
@@ -134,7 +136,7 @@
/** resolve the host IP ( jk_resolve ) and initialize the channel.
*/
-static int jk_channel_socket_init(jk_channel_t *_this,
+static int JK_METHOD jk_channel_socket_init(jk_channel_t *_this,
jk_map_t *props,
char *worker_name,
jk_worker_t *worker,
@@ -203,7 +205,7 @@
/** connect to Tomcat (jk_open_socket)
*/
-static int jk_channel_socket_open(jk_channel_t *_this, jk_endpoint_t
*endpoint)
+static int JK_METHOD jk_channel_socket_open(jk_channel_t *_this,
jk_endpoint_t
*endpoint)
{
jk_logger_t *l=_this->logger;
int err=jk_log(l, JK_LOG_DEBUG, "Into jk_channel_socket_open\n");
@@ -273,7 +275,7 @@
/** close the socket ( was: jk_close_socket )
*/
-int jk_channel_socket_close(jk_channel_t *_this, jk_endpoint_t
*endpoint)
+static int JK_METHOD jk_channel_socket_send(jk_channel_t *_this,
jk_endpoint_t *endpoint,
char *b, int len)
{
@@ -340,7 +342,7 @@
* >0: length of the received data.
* Was: tcp_socket_recvfull
*/
-static int jk_channel_socket_recv( jk_channel_t *_this,
+static int JK_METHOD jk_channel_socket_recv( jk_channel_t *_this,
jk_endpoint_t *endpoint,
char *b, int len )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
