procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* dispnew.c (PENDING_OUTPUT_COUNT) [!__GNU_LIBRARY__]: Clarify fallback case.

Browse source
This commit is contained in:
Glenn Morris 2012-07-10 15:04:14 -04:00
parent 7d7bbefd04
commit c59592b32f
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-07-10 Glenn Morris <rgm@gnu.org>
* dispnew.c (PENDING_OUTPUT_COUNT) [!__GNU_LIBRARY__]:
Clarify fallback case.
2012-07-10 Dmitry Antipov <dmantipov@yandex.ru>
Use XCAR and XCDR instead of Fcar and Fcdr where possible.

15
src/dispnew.c
View file

@ -65,28 +65,29 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Get number of chars of output now in the buffer of a stdio stream.
This ought to be built in stdio, but it isn't. Some s- files
override this because their stdio internals differ. */
#ifdef __GNU_LIBRARY__
/* The s- file might have overridden the definition with one that
works for the system's C library. But we are using the GNU C
library, so this is the right definition for every system. */
#ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT
#define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT
#else
#undef PENDING_OUTPUT_COUNT
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer)
#endif
#else /* not __GNU_LIBRARY__ */
#if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING
/* not __GNU_LIBRARY__ and no PENDING_OUTPUT_COUNT defined */
#elif !defined (PENDING_OUTPUT_COUNT)
#if HAVE_STDIO_EXT_H && HAVE___FPENDING
#include <stdio_ext.h>
#define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE)
#endif
#ifndef PENDING_OUTPUT_COUNT
#else
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)
#endif
#endif /* not __GNU_LIBRARY__ */
#endif /* not __GNU_LIBRARY__ and no PENDING_OUTPUT_COUNT defined */
#if defined (HAVE_TERM_H) && defined (GNU_LINUX)
#include <term.h> /* for tgetent */