From a8ab93b0f64c76afb7c790a60d3c8c0359a0770f Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 7 Aug 2012 13:03:48 +0200 Subject: [PATCH] * nt/config.nt: Sync with autogen/config.nt. (BROKEN_GETWD, DISPNEW_NEEDS_STDIO_EXT): New macros. (PENDING_OUTPUT_COUNT): Move definition to inc/ms-w32.h. * nt/inc/ms-w32.h (PENDING_OUTPUT_COUNT): Define. --- nt/ChangeLog | 8 ++++++++ nt/config.nt | 12 +++++++----- nt/inc/ms-w32.h | 7 +++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 11d62250c20..46a425b60c6 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,11 @@ +2012-08-07 Juanma Barranquero + + * config.nt: Sync with autogen/config.nt. + (BROKEN_GETWD, DISPNEW_NEEDS_STDIO_EXT): New macros. + (PENDING_OUTPUT_COUNT): Move definition to inc/ms-w32.h. + + * inc/ms-w32.h (PENDING_OUTPUT_COUNT): Define. + 2012-08-06 Glenn Morris * config.nt (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove. diff --git a/nt/config.nt b/nt/config.nt index f0bcce7a285..fe21f15f2fb 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -58,6 +58,9 @@ along with GNU Emacs. If not, see . */ /* Define if FIONREAD should not be used. */ #undef BROKEN_FIONREAD +/* Define if getwd should not be used. */ +#undef BROKEN_GETWD + /* Define if get_current_dir_name should not be used. */ #undef BROKEN_GET_CURRENT_DIR_NAME @@ -128,6 +131,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 for DGUX with . */ #undef DGUX +/* Define if dispnew.c should include stdio_ext.h. */ +#undef DISPNEW_NEEDS_STDIO_EXT + /* Define if process.c does not need to close a pty to make it a controlling terminal (it is already a controlling terminal of the subprocess, because we did ioctl TIOCSCTTY). */ @@ -1226,11 +1232,7 @@ along with GNU Emacs. If not, see . */ #undef PACKAGE_VERSION /* Number of chars of output in the buffer of a stdio stream. */ -#ifdef __GNU_LIBRARY__ -#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer) -#else -#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) -#endif +#undef PENDING_OUTPUT_COUNT /* Define to empty to suppress deprecation warnings when building with --enable-gcc-warnings and with libpng versions before 1.5, which lack diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 82590e2c350..022b168c0b8 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -26,6 +26,13 @@ along with GNU Emacs. If not, see . */ /* #undef const */ +/* Number of chars of output in the buffer of a stdio stream. */ +#ifdef __GNU_LIBRARY__ +#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer) +#else +#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) +#endif + /* If you are compiling with a non-C calling convention but need to declare vararg routines differently, put it here. */ #define _VARARGS_ __cdecl -- 2.39.2