* fhandler.h (dev_console::b): Redefine as CONSOLE_SCREEN_BUFFER_INFO for use

with older OS.
* fhandler_console.cc (dev_console::fillin): Ditto for
GetConsoleScreenBufferInfo.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0d3c5cc8b265fca6ecb5624cd16e87d7963a91d1..debee8b5769c3f545bca6b9618ad9c8e52bbe576 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-10  Christopher Faylor  <me.cygwin2014@cgf.cx>
+
+       * fhandler.h (dev_console::b): Redefine as CONSOLE_SCREEN_BUFFER_INFO
+       for use with older OS.
+       * fhandler_console.cc (dev_console::fillin): Ditto for
+       GetConsoleScreenBufferInfo.
+
 2014-03-10  Christopher Faylor  <me.cygwin2014@cgf.cx>
 
        * fhandler_console.cc (dev_console::save_restore): Save entire line of

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 6d9a1b7e7c69cba7f055d217e344ae86617dce2d..5e86f003c4d7553e4034413608dd6b17608e51b1 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1294,7 +1294,7 @@ class dev_console
       short Bottom;
     } scroll_region;
 
-  CONSOLE_SCREEN_BUFFER_INFOEX b;
+  CONSOLE_SCREEN_BUFFER_INFO b;
   COORD dwWinSize;
   COORD dwEnd;
 

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index ffbda48135784c8b8913a4352f90d5a4d8daac10..7a97fc461423cf9cbd1e2a1886fa0eec3fd4700d 100644 (file)
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -733,8 +733,7 @@ dev_console::fillin (HANDLE h)
 {
   bool ret;
 
-  b.cbSize = sizeof (b);
-  if ((ret = GetConsoleScreenBufferInfoEx (h, &b)))
+  if ((ret = GetConsoleScreenBufferInfo (h, &b)))
     {
       dwWinSize.Y = 1 + b.srWindow.Bottom - b.srWindow.Top;
       dwWinSize.X = 1 + b.srWindow.Right - b.srWindow.Left;