Author: mturk
Date: Wed Oct 1 22:59:36 2008
New Revision: 701008
URL: http://svn.apache.org/viewvc?rev=701008&view=rev
Log:
Don't use <io.h> defined names for local functions
Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=701008&r1=701007&r2=701008&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Wed Oct 1 22:59:36
2008
@@ -237,10 +237,10 @@
const char *const *header_values,
unsigned int num_of_headers);
-static int JK_METHOD read(jk_ws_service_t *s,
+static int JK_METHOD iis_read(jk_ws_service_t *s,
void *b, unsigned int l, unsigned int *a);
-static int JK_METHOD write(jk_ws_service_t *s, const void *b, unsigned int l);
+static int JK_METHOD iis_write(jk_ws_service_t *s, const void *b, unsigned int
l);
static int init_ws_service(isapi_private_data_t * private_data,
jk_ws_service_t *s, char **worker_name);
@@ -663,7 +663,7 @@
return JK_FALSE;
}
-static int JK_METHOD read(jk_ws_service_t *s,
+static int JK_METHOD iis_read(jk_ws_service_t *s,
void *b, unsigned int l, unsigned int *a)
{
JK_TRACE_ENTER(logger);
@@ -739,7 +739,7 @@
return JK_FALSE;
}
-static int JK_METHOD write(jk_ws_service_t *s, const void *b, unsigned int l)
+static int JK_METHOD iis_write(jk_ws_service_t *s, const void *b, unsigned int
l)
{
JK_TRACE_ENTER(logger);
@@ -2050,8 +2050,8 @@
JK_TRACE_ENTER(logger);
s->start_response = start_response;
- s->read = read;
- s->write = write;
+ s->read = iis_read;
+ s->write = iis_write;
if (!(huge_buf = jk_pool_alloc(&private_data->p, MAX_PACKET_SIZE))) {
JK_TRACE_EXIT(logger);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
