You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Michael Smith <ms...@speedlegal.com> on 2001/11/19 12:42:23 UTC

PATCH: jakarta-tomcat-connectors build on MSVC6

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:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: PATCH: jakarta-tomcat-connectors build on MSVC6

Posted by Remy Maucherat <rm...@home.com>.
> On Mon, 19 Nov 2001, Remy Maucherat wrote:
>
> In general, I think all jakarta commiters should have cross-project
> permissions - maybe with the additional requirement that you need a
> "review-then-commit" process when commiting to a project you are not
> 'regular' commiter.
> There are many 'integration' bugs ( project X doesn't work with project Y
> ) that would be solved much quicker this way. But this is something for
> the PMC to decide.
>
> I'll vote +1 for any apache commiter ( i.e. jakarta, xml, httpd... ) who
> wants to become a commiter on tomcat.

Good, but according to the current policy, it's not automatic, so I'm
posting a regular vote.

Remy


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: [VOTE] New committer: Michael Smith

Posted by Patrick Luby <pa...@sun.com>.
+1

Patrick

Remy Maucherat wrote:

> Hi,
>
> I'd like to nominate Michael Smith [msmith at apache.org] as a committer on
> the Tomcat subproject. Michael already has commit access on the Slide
> subproject, and has contributed important bug fixes for Tomcat 4 as well as
> mod_jk.
>
> He has my +1.
>
> Remy
>
> --
> To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: [VOTE] New committer: Michael Smith

Posted by Bill Barker <wb...@wilshire.com>.
+1
----- Original Message -----
From: "Remy Maucherat" <rm...@home.com>
To: "Tomcat Developers List" <to...@jakarta.apache.org>
Sent: Monday, November 19, 2001 10:29 AM
Subject: [VOTE] New committer: Michael Smith


> Hi,
>
> I'd like to nominate Michael Smith [msmith at apache.org] as a committer
on
> the Tomcat subproject. Michael already has commit access on the Slide
> subproject, and has contributed important bug fixes for Tomcat 4 as well
as
> mod_jk.
>
> He has my +1.
>
> Remy
>
>
> --
> To unsubscribe, e-mail:
<ma...@jakarta.apache.org>
> For additional commands, e-mail:
<ma...@jakarta.apache.org>
>


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: [VOTE] New committer: Michael Smith

Posted by Bojan Smojver <bo...@binarix.com>.
+1

Bojan

Remy Maucherat wrote:
> 
> Hi,
> 
> I'd like to nominate Michael Smith [msmith at apache.org] as a committer on
> the Tomcat subproject. Michael already has commit access on the Slide
> subproject, and has contributed important bug fixes for Tomcat 4 as well as
> mod_jk.

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: [VOTE] New committer: Michael Smith

Posted by Amy Roh <am...@apache.org>.
+1

Amy

Remy Maucherat wrote:

> Hi,
>
> I'd like to nominate Michael Smith [msmith at apache.org] as a committer on
> the Tomcat subproject. Michael already has commit access on the Slide
> subproject, and has contributed important bug fixes for Tomcat 4 as well as
> mod_jk.
>
> He has my +1.
>
> Remy
>
> --
> To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: [VOTE] New committer: Michael Smith

Posted by co...@covalent.net.
On Mon, 19 Nov 2001, Remy Maucherat wrote:

> Hi,
>
> I'd like to nominate Michael Smith [msmith at apache.org] as a committer on
> the Tomcat subproject. Michael already has commit access on the Slide
> subproject, and has contributed important bug fixes for Tomcat 4 as well as
> mod_jk.
>
> He has my +1.

+1

Costin


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


[VOTE] New committer: Michael Smith

Posted by Remy Maucherat <rm...@home.com>.
Hi,

I'd like to nominate Michael Smith [msmith at apache.org] as a committer on
the Tomcat subproject. Michael already has commit access on the Slide
subproject, and has contributed important bug fixes for Tomcat 4 as well as
mod_jk.

He has my +1.

Remy


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: PATCH: jakarta-tomcat-connectors build on MSVC6

Posted by cm...@yahoo.com.
On Mon, 19 Nov 2001, Remy Maucherat wrote:

> > On Mon, 19 Nov 2001, Michael Smith wrote:
> >
> > > 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).
> >
> > Thanks Michael !
>
> How about giving Michael commit access ?
> He already has an account @Jakarta, so he just needs some additional karma.

In general, I think all jakarta commiters should have cross-project
permissions - maybe with the additional requirement that you need a
"review-then-commit" process when commiting to a project you are not
'regular' commiter.
There are many 'integration' bugs ( project X doesn't work with project Y
) that would be solved much quicker this way. But this is something for
the PMC to decide.

I'll vote +1 for any apache commiter ( i.e. jakarta, xml, httpd... ) who
wants to become a commiter on tomcat.

Costin





--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: PATCH: jakarta-tomcat-connectors build on MSVC6

Posted by Remy Maucherat <rm...@home.com>.
> On Mon, 19 Nov 2001, Michael Smith wrote:
> 
> > 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).
> 
> Thanks Michael !

How about giving Michael commit access ?
He already has an account @Jakarta, so he just needs some additional karma.

Remy


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: PATCH: jakarta-tomcat-connectors build on MSVC6

Posted by co...@covalent.net.
On Mon, 19 Nov 2001, Michael Smith wrote:

> 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).

Thanks Michael !

Costin



--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>