Sweeping cleanups. Sorry for the massive commit; I got sidetracked once too often.

[pdclib] / internals / _PDCLIB_io.h

diff --git a/internals/_PDCLIB_io.h b/internals/_PDCLIB_io.h
index 2df3ff5ca6dd1b31927a32abd8097938acef24d6..27c33e7dd7a50d360ee58710bacfee8213ed524d 100644 (file)
--- a/internals/_PDCLIB_io.h
+++ b/internals/_PDCLIB_io.h
@@ -1,14 +1,15 @@
-#ifndef __PDCLIB_IO_H\r
-#define __PDCLIB_IO_H __PDCLIB_IO_H\r
-#include "_PDCLIB_int.h"\r
-#include "_PDCLIB_threadconfig.h"\r
-\r
-/* PDCLib internal I/O logic <_PDCLIB_io.h>\r
+/* PDCLib I/O support <_PDCLIB_io.h>\r
 \r
    This file is part of the Public Domain C Library (PDCLib).\r
    Permission is granted to use, modify, and / or redistribute at will.\r
 */\r
 \r
+#ifndef __PDCLIB_IO_H\r
+#define __PDCLIB_IO_H __PDCLIB_IO_H\r
+\r
+#include "_PDCLIB_int.h"\r
+#include "_PDCLIB_threadconfig.h"\r
+\r
 /* Flags for representing mode (see fopen()). Note these must fit the same\r
    status field as the _IO?BF flags in <stdio.h> and the internal flags below.\r
 */\r
@@ -179,6 +180,9 @@ struct _PDCLIB_file
     _PDCLIB_size_t            bufsize;  /* Size of buffer */\r
     _PDCLIB_size_t            bufidx;   /* Index of current position in buffer */\r
     _PDCLIB_size_t            bufend;   /* Index of last pre-read character in buffer */\r
+#ifdef _PDCLIB_NEED_EOL_TRANSLATION\r
+    _PDCLIB_size_t            bufnlexp; /* Current position of buffer newline expansion */\r
+#endif\r
     _PDCLIB_size_t            ungetidx; /* Number of ungetc()'ed characters */\r
     unsigned char *           ungetbuf; /* ungetc() buffer */\r
     unsigned int              status;   /* Status flags; see above */\r