4 files changed, 9 insertions, 9 deletions
diff --git a/doio.c b/doio.c
index 2577b2f316..cad08a7d0d 100644
--- a/doio.c
+++ b/doio.c
@@ -1108,7 +1108,7 @@ Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode)
   * This is a stub for any XS code which might have been calling it.
   */
  char *name = ":raw";
-#ifdef PERLIO_CRLF
+#ifdef PERLIO_USING_CRLF
  if (!(mode & O_BINARY)))
      name = ":crlf";
 #endif
diff --git a/perl.h b/perl.h
index dbfadc8bb3..5782b71b6b 100644
--- a/perl.h
+++ b/perl.h
@@ -3945,11 +3945,11 @@ int flock(int fd, int op);
     /* If you have different O_TEXT and O_BINARY and you are a CLRF shop,
      * that is, you are somehow DOSish. */
 #   if !defined(__BEOS__)
-#      define PERLIO_CLRF 1
+#      define PERLIO_USING_CRLF 1
 #   else
     /* If you have O_TEXT different from your O_BINARY but you still are
      * not a CRLF shop. */
-#       undef PERLIO_CLRF
+#       undef PERLIO_USING_CRLF
 #   endif
 #endif
 
diff --git a/perlio.c b/perlio.c
index c45c71abec..db21071296 100644
--- a/perlio.c
+++ b/perlio.c
@@ -859,7 +859,7 @@ void
 PerlIO_default_buffer(pTHX_ PerlIO_list_t *av)
 {
     PerlIO_funcs *tab = &PerlIO_perlio;
-#ifdef PERLIO_CRLF
+#ifdef PERLIO_USING_CRLF
     tab = &PerlIO_crlf;
 #else
     if (PerlIO_stdio.Set_ptrcnt)
@@ -1076,7 +1076,7 @@ PerlIO_binmode(pTHX_ PerlIO *f, int iotype, int mode, const char *names)
     /* Can't flush if switching encodings. */
     if (!(names && memEQ(names, ":encoding(", 10))) {
         PerlIO_flush(f);
-#ifdef PERLIO_CRLF
+#ifdef PERLIO_USING_CRLF
 	if (!names && (mode & O_BINARY)) {
 	    PerlIO *top = f;
 	    while (*top) {
@@ -1781,7 +1781,7 @@ PerlIO_modestr(PerlIO *f, char *buf)
 	    *s++ = '+';
 	}
     }
-#ifdef PERLIO_CRLF
+#ifdef PERLIO_USING_CRLF
     if (!(flags & PERLIO_F_CRLF))
 	*s++ = 'b';
 #endif
@@ -2367,7 +2367,7 @@ PerlIOStdio_mode(const char *mode, char *tmode)
     while (*mode) {
 	*tmode++ = *mode++;
     }
-#ifdef PERLIO_CRLF
+#ifdef PERLIO_USING_CRLF
     *tmode++ = 'b';
 #endif
     *tmode = '\0';
@@ -2906,7 +2906,7 @@ PerlIOBuf_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers,
 		return NULL;
 	    } else {
 		fd = PerlIO_fileno(f);
-#ifdef PERLIO_CRLF
+#ifdef PERLIO_USING_CRLF
 		/*
 		 * do something about failing setmode()? --jhi
 		 */
diff --git a/perliol.h b/perliol.h
index 4be2fbfcda..2a681c0059 100644
--- a/perliol.h
+++ b/perliol.h
@@ -111,7 +111,7 @@ extern PerlIO *PerlIO_allocate(pTHX);
 extern SV *PerlIO_arg_fetch(PerlIO_list_t *av, IV n);
 #define PerlIOArg PerlIO_arg_fetch(layers,n)
 
-#ifdef PERLIO_CRLF
+#ifdef PERLIO_USING_CRLF
 #define PERLIO_STDTEXT "t"
 #else
 #define PERLIO_STDTEXT ""