tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lar...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/native/jk jk_nwmain.c jk_global.h
Date Thu, 05 Oct 2000 06:35:59 GMT
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 <shachor@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
  
  
  

Mime
View raw message