tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_md5.h jk_mt.h portable.h
Date Thu, 02 Dec 2004 06:50:01 GMT
mturk       2004/12/01 22:50:01

  Modified:    jk/native/apache-1.3 mod_jk.c
               jk/native/apache-2.0 mod_jk.c
               jk/native/common jk_md5.h jk_mt.h portable.h
  Log:
  Remove few CRLF's present.
  
  Revision  Changes    Path
  1.55      +9 -9      jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_jk.c	30 Nov 2004 08:22:47 -0000	1.54
  +++ mod_jk.c	2 Dec 2004 06:50:01 -0000	1.55
  @@ -674,7 +674,7 @@
       char *old;
       const char *c, *w;
   
  -    if (worker != NULL && cmd->path == NULL ) {
  +    if (worker != NULL && cmd->path == NULL ) {
           c = context;
           w = worker;
       }
  @@ -683,9 +683,9 @@
           w = context;
       }
       else {
  -        if (worker == NULL)
  -            return "JkMount needs a path when not defined in a location";
  -        else 
  +        if (worker == NULL)
  +            return "JkMount needs a path when not defined in a location";
  +        else 
               return "JkMount can not have a path when defined in a location";
       }
   
  @@ -717,7 +717,7 @@
       char *old , *uri;
       const char *c, *w;
   
  -    if (worker != NULL && cmd->path == NULL ) {
  +    if (worker != NULL && cmd->path == NULL ) {
           c = context;
           w = worker;
       }
  @@ -726,9 +726,9 @@
           w = context;
       }
       else {
  -        if (worker == NULL)
  -            return "JkUnMount needs a path when not defined in a location";
  -        else 
  +        if (worker == NULL)
  +            return "JkUnMount needs a path when not defined in a location";
  +        else 
               return "JkUnMount can not have a path when defined in a location";
       }
       if (c[0] != '/')
  
  
  
  1.105     +9 -9      jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- mod_jk.c	30 Nov 2004 13:21:57 -0000	1.104
  +++ mod_jk.c	2 Dec 2004 06:50:01 -0000	1.105
  @@ -714,7 +714,7 @@
       char *old;
       const char *c, *w;
   
  -    if (worker != NULL && cmd->path == NULL ) {
  +    if (worker != NULL && cmd->path == NULL ) {
           c = context;
           w = worker;
       }
  @@ -723,9 +723,9 @@
           w = context;
       }
       else {
  -        if (worker == NULL)
  -            return "JkMount needs a path when not defined in a location";
  -        else 
  +        if (worker == NULL)
  +            return "JkMount needs a path when not defined in a location";
  +        else 
               return "JkMount can not have a path when defined in a location";
       }
   
  @@ -757,7 +757,7 @@
       char *old , *uri;
       const char *c, *w;
   
  -    if (worker != NULL && cmd->path == NULL ) {
  +    if (worker != NULL && cmd->path == NULL ) {
           c = context;
           w = worker;
       }
  @@ -766,9 +766,9 @@
           w = context;
       }
       else {
  -        if (worker == NULL)
  -            return "JkUnMount needs a path when not defined in a location";
  -        else 
  +        if (worker == NULL)
  +            return "JkUnMount needs a path when not defined in a location";
  +        else 
               return "JkUnMount can not have a path when defined in a location";
       }
   
  
  
  
  1.7       +2 -2      jakarta-tomcat-connectors/jk/native/common/jk_md5.h
  
  Index: jk_md5.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jk_md5.h	10 Nov 2004 14:35:41 -0000	1.6
  +++ jk_md5.h	2 Dec 2004 06:50:01 -0000	1.7
  @@ -59,8 +59,8 @@
   /* JK_UINT4 defines a four byte word */
   #if defined (WIN32)
       typedef DWORD JK_UINT4;
  -#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
  -    typedef unsigned int JK_UINT4;
  +#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
  +    typedef unsigned int JK_UINT4;
   #else
       typedef uint32_t JK_UINT4;
   #endif
  
  
  
  1.11      +4 -4      jakarta-tomcat-connectors/jk/native/common/jk_mt.h
  
  Index: jk_mt.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_mt.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_mt.h	30 Nov 2004 13:11:21 -0000	1.10
  +++ jk_mt.h	2 Dec 2004 06:50:01 -0000	1.11
  @@ -30,9 +30,9 @@
   #define jk_gettid()    ((int)GetCurrentThreadId())
   #elif defined(NETWARE)
   #define jk_gettid()    ((int)GetThreadID())
  -#if !defined(__NOVELL_LIBC__)
  -#define getpid()       ((int)GetThreadGroupID())
  -#endif /* __NOVELL_LIBC__ */
  +#if !defined(__NOVELL_LIBC__)
  +#define getpid()       ((int)GetThreadGroupID())
  +#endif /* __NOVELL_LIBC__ */
   #endif
   
   
  
  
  
  1.3       +1 -1      jakarta-tomcat-connectors/jk/native/common/portable.h
  
  Index: portable.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/portable.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portable.h	23 Jul 2004 09:19:22 -0000	1.2
  +++ portable.h	2 Dec 2004 06:50:01 -0000	1.3
  @@ -1 +1 @@
  -/* On most platform this file is overwritten when doing configure */
  +/* On most platform this file is overwritten when doing configure */
  
  
  

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


Mime
View raw message