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

* nt/config.nt: Sync with autogen/config.nt.

Browse source 
(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.
This commit is contained in:
Juanma Barranquero 2012-08-07 13:03:48 +02:00
parent c0528ebe51
commit a8ab93b0f6
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nt/ChangeLog
View file

@ -1,3 +1,11 @@
2012-08-07 Juanma Barranquero <lekktu@gmail.com>
* 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 <rgm@gnu.org>
* config.nt (GNU_LIBRARY_PENDING_OUTPUT_COUNT): Remove.

12
nt/config.nt
View file

@ -58,6 +58,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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 <http://www.gnu.org/licenses/>. */
/* 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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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

7
nt/inc/ms-w32.h
View file

@ -26,6 +26,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* #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