You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@locus.apache.org on 2000/10/05 08:35:59 UTC
cvs commit: jakarta-tomcat/src/native/jk jk_nwmain.c jk_global.h
larryi 00/10/04 23:35:58
Modified: src/native/jk Tag: tomcat_32 jk_nwmain.c jk_global.h
Log:
Fix mod_jk build for Solaris
Patches supplied by: Mike Bremford
Revision Changes Path
No revision
No revision
1.1.2.2 +2 -0 jakarta-tomcat/src/native/jk/Attic/jk_nwmain.c
Index: jk_nwmain.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_nwmain.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- jk_nwmain.c 2000/09/13 23:06:26 1.1.2.1
+++ jk_nwmain.c 2000/10/05 06:35:56 1.1.2.2
@@ -1,3 +1,4 @@
+#ifdef NETWARE
/*
* NATIVE_MAIN
*/
@@ -27,3 +28,4 @@
{
ExitThread (TSR_THREAD, 0);
}
+#endif
1.2.2.2 +2 -2 jakarta-tomcat/src/native/jk/Attic/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_global.h,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- jk_global.h 2000/09/13 23:06:25 1.2.2.1
+++ jk_global.h 2000/10/05 06:35:57 1.2.2.2
@@ -57,7 +57,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.2.2.1 $ *
+ * Version: $Revision: 1.2.2.2 $ *
***************************************************************************/
#ifndef JK_GLOBAL_H
@@ -82,6 +82,7 @@
#include <netdb.h>
#include <netinet/in.h>
+ #include <sys/socket.h>
#ifndef NETWARE
#include <netinet/tcp.h>
#include <arpa/inet.h>
@@ -90,7 +91,6 @@
#include <sys/select.h>
#endif
- #include <sys/socket.h>
#include <sys/time.h>
#include <sys/ioctl.h>
#endif
Re: cvs commit: jakarta-tomcat/src/native/jk jk_nwmain.c jk_global.h
Posted by Alex Chaffee <gu...@edamame.stinky.com>.
src/native/jk is obsolete. Note that your patch went to the Attic.
You neglected to sync before editing. This change should have been
made to src/native/mod_jk/...
Larry, can you fix? I don't have the time to work on this right now...
btw, "cvs update -fdRP" would delete empty directories too.
Cheers -
- Alex
On Thu, Oct 05, 2000 at 06:35:59AM -0000, larryi@locus.apache.org wrote:
> larryi 00/10/04 23:35:58
>
> Modified: src/native/jk Tag: tomcat_32 jk_nwmain.c jk_global.h
> Log:
> Fix mod_jk build for Solaris
>
> Patches supplied by: Mike Bremford
>
> Revision Changes Path
> No revision
>
>
> No revision
>
>
> 1.1.2.2 +2 -0 jakarta-tomcat/src/native/jk/Attic/jk_nwmain.c
>
> Index: jk_nwmain.c
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_nwmain.c,v
> retrieving revision 1.1.2.1
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.1 -r1.1.2.2
> --- jk_nwmain.c 2000/09/13 23:06:26 1.1.2.1
> +++ jk_nwmain.c 2000/10/05 06:35:56 1.1.2.2
> @@ -1,3 +1,4 @@
> +#ifdef NETWARE
> /*
> * NATIVE_MAIN
> */
> @@ -27,3 +28,4 @@
> {
> ExitThread (TSR_THREAD, 0);
> }
> +#endif
>
>
>
> 1.2.2.2 +2 -2 jakarta-tomcat/src/native/jk/Attic/jk_global.h
>
> Index: jk_global.h
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_global.h,v
> retrieving revision 1.2.2.1
> retrieving revision 1.2.2.2
> diff -u -r1.2.2.1 -r1.2.2.2
> --- jk_global.h 2000/09/13 23:06:25 1.2.2.1
> +++ jk_global.h 2000/10/05 06:35:57 1.2.2.2
> @@ -57,7 +57,7 @@
> * Description: Global definitions and include files that should exist *
> * anywhere *
> * Author: Gal Shachor <sh...@il.ibm.com> *
> - * Version: $Revision: 1.2.2.1 $ *
> + * Version: $Revision: 1.2.2.2 $ *
> ***************************************************************************/
>
> #ifndef JK_GLOBAL_H
> @@ -82,6 +82,7 @@
> #include <netdb.h>
>
> #include <netinet/in.h>
> + #include <sys/socket.h>
> #ifndef NETWARE
> #include <netinet/tcp.h>
> #include <arpa/inet.h>
> @@ -90,7 +91,6 @@
> #include <sys/select.h>
> #endif
>
> - #include <sys/socket.h>
> #include <sys/time.h>
> #include <sys/ioctl.h>
> #endif
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
--
Alex Chaffee mailto:alex@jguru.com
jGuru - Java News and FAQs http://www.jguru.com/alex/
Creator of Gamelan http://www.gamelan.com/
Founder of Purple Technology http://www.purpletech.com/
Curator of Stinky Art Collective http://www.stinky.com/