diff options
| author | Skip Montanaro <skip@pobox.com> | 2004-02-07 13:53:46 (GMT) |
|---|---|---|
| committer | Skip Montanaro <skip@pobox.com> | 2004-02-07 13:53:46 (GMT) |
| commit | db6080507d7b507cfe9aa524d012a96b5dfefc2d (patch) | |
| tree | 593e10c5f3aa003380b0a31a923dc0c181ae1298 /Include | |
| parent | f1afe6682c34044547c13e4e6f1f848bada236d6 (diff) | |
| download | cpython-db6080507d7b507cfe9aa524d012a96b5dfefc2d.zip cpython-db6080507d7b507cfe9aa524d012a96b5dfefc2d.tar.gz cpython-db6080507d7b507cfe9aa524d012a96b5dfefc2d.tar.bz2 | |
Remove support for --without-universal-newlines (see PEP 11).
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/fileobject.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Include/fileobject.h b/Include/fileobject.h index 2ec4b24..35b2c3df 100644 --- a/Include/fileobject.h +++ b/Include/fileobject.h @@ -20,11 +20,9 @@ typedef struct { char* f_bufend; /* Points after last occupied position */ char* f_bufptr; /* Current buffer position */ char *f_setbuf; /* Buffer for setbuf(3) and setvbuf(3) */ -#ifdef WITH_UNIVERSAL_NEWLINES int f_univ_newline; /* Handle any newline convention */ int f_newlinetypes; /* Types of newlines seen */ int f_skipnextlf; /* Skip next \n */ -#endif PyObject *f_encoding; } PyFileObject; @@ -51,19 +49,13 @@ PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *); */ PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding; -#ifdef WITH_UNIVERSAL_NEWLINES /* Routines to replace fread() and fgets() which accept any of \r, \n or \r\n as line terminators. */ #define PY_STDIOTEXTMODE "b" char *Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *); size_t Py_UniversalNewlineFread(char *, size_t, FILE *, PyObject *); -#else -#define PY_STDIOTEXTMODE "" -#define Py_UniversalNewlineFgets(buf, len, fp, obj) fgets((buf), (len), (fp)) -#define Py_UniversalNewlineFread(buf, len, fp, obj) \ - fread((buf), 1, (len), (fp)) -#endif /* WITH_UNIVERSAL_NEWLINES */ + #ifdef __cplusplus } #endif |