[Emacs-diffs] /srv/bzr/emacs/trunk r109492: * nt/config.nt: Sync with autogen/config.nt.

[Juanma Barranquero]

------------------------------------------------------------
revno: 109492
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-07 13:03:48 +0200
message:
  * 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.
modified:
  nt/ChangeLog
  nt/config.nt
  nt/inc/ms-w32.h

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-08-06 20:22:22 +0000
+++ b/nt/ChangeLog      2012-08-07 11:03:48 +0000
@@ -1,3 +1,11 @@
+2012-08-07  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * config.nt (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-08-06 20:22:22 +0000
+++ b/nt/config.nt      2012-08-07 11:03:48 +0000
@@ -58,6 +58,9 @@
 /* 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 @@
 /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
 #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 @@
 #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

=== modified file 'nt/inc/ms-w32.h'
--- a/nt/inc/ms-w32.h   2012-08-03 12:16:40 +0000
+++ b/nt/inc/ms-w32.h   2012-08-07 11:03:48 +0000
@@ -26,6 +26,13 @@
 
 /* #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