Merge from vendor branch TNF:
[pkgsrcv2.git] / devel / cvs / patches / patch-aq
1 $NetBSD$
2
3 --- src/recurse.c.orig  Sun Jul 26 22:54:14 1998
4 +++ src/recurse.c       Tue Apr 20 10:15:04 1999
5 @@ -364,7 +364,7 @@
6      if (frame->flags == R_SKIP_ALL)
7         return (0);
8  
9 -    should_readlock = noexec ? 0 : frame->readlock;
10 +    should_readlock = nolock ? 0 : frame->readlock;
11  
12      /* The fact that locks are not active here is what makes us fail to have
13         the
14 @@ -406,7 +406,7 @@
15       */
16      if (server_active
17         /* If there are writelocks around, we cannot pause here.  */
18 -       && (should_readlock || noexec))
19 +       && (should_readlock || nolock))
20         server_pause_check();
21  #endif
22