X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=ncurses%2Fcurses.priv.h;h=e7af5822fcdd309370ebd60c065bf861e452d682;hb=b116355ab2af379e49fd0be31bdd440fc14fd902;hp=ec9826e8bfb7911d827e28d67f401b04a47356c2;hpb=0de8912c1c0746eb37b733e9e6fdf852aab9506a;p=ncurses.git

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index ec9826e8..e7af5822 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.619 2019/03/23 23:45:56 tom Exp $
+ * $Id: curses.priv.h,v 1.621 2019/05/04 20:29:09 tom Exp $
  *
  *	curses.priv.h
  *
@@ -243,8 +243,13 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t);
  * POSIX ignores the "b", which c89 specified.  Some very old systems do not
  * accept it.
  */
+#if USE_FOPEN_BIN_R
 #define BIN_R	"rb"
 #define BIN_W	"wb"
+#else
+#define BIN_R	"r"
+#define BIN_W	"w"
+#endif
 
 /*
  * Scroll hints are useless when hashmap is used
@@ -2033,6 +2038,12 @@ extern NCURSES_EXPORT(void) _nc_expanded (void);
 	    ttytype[NAMESIZE - 1] = '\0'; \
 	}
 
+#if !NCURSES_WCWIDTH_GRAPHICS
+extern NCURSES_EXPORT(int) _nc_wacs_width(unsigned);
+#else
+#define _nc_wacs_width(ch) wcwidth(ch)
+#endif
+
 /* charable.c */
 #if USE_WIDEC_SUPPORT
 extern NCURSES_EXPORT(bool) _nc_is_charable(wchar_t);