From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Sun, 29 Oct 2000 21:05:04 +0000 (+0000)
Subject: Integrate mainline to perlio branch
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4c26942a369632c790d266d8d26f6495e6383c3e;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline to perlio branch

p4raw-id: //depot/perlio@7486
---

4c26942a369632c790d266d8d26f6495e6383c3e
diff --cc iperlsys.h
index 9357e0e,6844801..caca9df
--- a/iperlsys.h
+++ b/iperlsys.h
@@@ -185,14 -185,20 +185,20 @@@ struct IPerlStdIOInf
  };
  
  #ifdef USE_STDIO_PTR
 -#  define PerlIO_has_cntptr(f)		1       
 +#  define PerlIO_has_cntptr(f)		1
- #  ifdef STDIO_CNT_LVALUE
- #    define PerlIO_canset_cnt(f)	1
- #    ifdef STDIO_PTR_LVALUE
+ #  ifdef STDIO_PTR_LVALUE
+ #    ifdef  STDIO_CNT_LVALUE
 -#      define PerlIO_canset_cnt(f)	1      
++#      define PerlIO_canset_cnt(f)	1
+ #      ifdef STDIO_PTR_LVAL_NOCHANGE_CNT
 -#        define PerlIO_fast_gets(f)	1        
++#        define PerlIO_fast_gets(f)	1
+ #      endif
+ #    else /* STDIO_CNT_LVALUE */
 -#      define PerlIO_canset_cnt(f)	0      
++#      define PerlIO_canset_cnt(f)	0
+ #    endif
+ #  else /* STDIO_PTR_LVALUE */
+ #    ifdef STDIO_PTR_LVAL_SETS_CNT
 -#      define PerlIO_fast_gets(f)	1        
 +#      define PerlIO_fast_gets(f)	1
  #    endif
- #  else
- #    define PerlIO_canset_cnt(f)	0
  #  endif
  #else  /* USE_STDIO_PTR */
  #  define PerlIO_has_cntptr(f)		0