bnicholes    2002/08/05 14:11:12

  Modified:    file_io/netware flock.c
  Log:
  Rollback the API change to NXFileRangeLock() and NXFileRangeUnlock()
  
  Revision  Changes    Path
  1.4       +0 -10     apr/file_io/netware/flock.c
  
  Index: flock.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/netware/flock.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- flock.c	17 Jul 2002 17:03:55 -0000	1.3
  +++ flock.c	5 Aug 2002 21:11:12 -0000	1.4
  @@ -55,7 +55,6 @@
   #include <nks/fsio.h>
   #include "fileio.h"
   
  -/*#define NEW_API */
   
   apr_status_t apr_file_lock(apr_file_t *thefile, int type)
   {
  @@ -63,12 +62,7 @@
   
   	fc = (type & APR_FLOCK_NONBLOCK) ? NX_RANGE_LOCK_TRYLOCK : NX_RANGE_LOCK_CHECK;
   
  -/* Remove this #ifdef once the next NDK ships */
  -#ifdef NEW_API
  -    if(NXFileRangeLock(thefile->filedes,fc, 0, 0, NX_LOCK_RANGE_FORWARD) == -1)
  -#else
       if(NXFileRangeLock(thefile->filedes,fc, 0, 0) == -1)
  -#endif
   		return errno;
               
       return APR_SUCCESS;
  @@ -76,11 +70,7 @@
   
   apr_status_t apr_file_unlock(apr_file_t *thefile)
   {
  -#ifdef NEW_API
  -    if(NXFileRangeUnlock(thefile->filedes,NX_RANGE_LOCK_CANCEL,0 , 0, NX_LOCK_RANGE_FORWARD) == -1)
  -#else
       if(NXFileRangeUnlock(thefile->filedes,NX_RANGE_LOCK_CANCEL,0 , 0) == -1)
  -#endif
   		return errno;
      
       return APR_SUCCESS;