tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmand...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_nwmain.c
Date Thu, 11 Apr 2002 21:50:25 GMT
mmanders    02/04/11 14:50:25

  Modified:    jk/native/common jk_nwmain.c
  Log:
  Updated to build for  Apache 2.0 on NetWare (LibC).
  
  Revision  Changes    Path
  1.3       +56 -1     jakarta-tomcat-connectors/jk/native/common/jk_nwmain.c
  
  Index: jk_nwmain.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_nwmain.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_nwmain.c	18 Jun 2001 14:15:59 -0000	1.2
  +++ jk_nwmain.c	11 Apr 2002 21:50:25 -0000	1.3
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: Netware Wrapper                                            *
    * Author:      Mike Anderson <mmander@novell.com>                         *
  - * Version:     $Revision: 1.2 $                                           *
  + * Version:     $Revision: 1.3 $                                           *
    ***************************************************************************/
   
   #ifdef NETWARE
  @@ -71,6 +71,12 @@
    */
   
   #include <stdio.h>
  +
  +/* Apache 2/APR uses NOVELL_LIBC which has a different way of handling
  + * "library" nlms.  If we aren't on LIBC, use the old method
  + */
  +
  +#ifndef __NOVELL_LIBC__
   #include <nwthread.h>
   #include <netdb.h>
   
  @@ -91,4 +97,53 @@
   {
      ExitThread (TSR_THREAD, 0);
   }
  +#else /* __NOVELL_LIBC__ */
  +
  +/* Since we are on LibC, we need to handle our own startup and shutdown */
  +
  +#include <netware.h>
  +#include "novsock2.h"
  +
  +int _NonAppStart
  +(
  +    void        *NLMHandle,
  +    void        *errorScreen,
  +    const char  *cmdLine,
  +    const char  *loadDirPath,
  +    size_t      uninitializedDataLength,
  +    void        *NLMFileHandle,
  +    int         (*readRoutineP)( int conn, void *fileHandle, size_t offset,
  +                    size_t nbytes, size_t *bytesRead, void *buffer ),
  +    size_t      customDataOffset,
  +    size_t      customDataSize,
  +    int         messageCount,
  +    const char  **messages
  +)
  +{
  +#pragma unused(cmdLine)
  +#pragma unused(loadDirPath)
  +#pragma unused(uninitializedDataLength)
  +#pragma unused(NLMFileHandle)
  +#pragma unused(readRoutineP)
  +#pragma unused(customDataOffset)
  +#pragma unused(customDataSize)
  +#pragma unused(messageCount)
  +#pragma unused(messages)
  +
  +    WSADATA wsaData;
  +    
  +    return WSAStartup((WORD) MAKEWORD(2, 0), &wsaData);
  +}
  +
  +void _NonAppStop( void )
  +{
  +    WSACleanup();
  +}
  +
  +int  _NonAppCheckUnload( void )
  +{
  +	return 0;
  +}
  +#endif /* __NOVELL_LIBC__ */
  +
   #endif
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message