[Python-checkins] python/dist/src/Include fileobject.h,2.33,2.34

[montanaro at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25111/Include

Modified Files:
	fileobject.h 
Log Message:
Remove support for --without-universal-newlines (see PEP 11).


Index: fileobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/fileobject.h,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** fileobject.h	4 Sep 2003 19:01:45 -0000	2.33
--- fileobject.h	7 Feb 2004 13:53:45 -0000	2.34
***************
*** 21,29 ****
  	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;
--- 21,27 ----
***************
*** 52,56 ****
  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.
--- 50,53 ----
***************
*** 59,68 ****
  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
  }
--- 56,60 ----
  char *Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
  size_t Py_UniversalNewlineFread(char *, size_t, FILE *, PyObject *);
! 
  #ifdef __cplusplus
  }