ncurses 5.8 - patch 20110307

[ncurses.git] / ncurses / base / lib_winch.c

diff --git a/ncurses/base/lib_winch.c b/ncurses/base/lib_winch.c
index 119c731ebe3b92ba9979224c2e2bbe2c82bacc67..7e75f85bf390740bcced907b3633485faaf1400f 100644 (file)
--- a/ncurses/base/lib_winch.c
+++ b/ncurses/base/lib_winch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -39,14 +39,16 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_winch.c,v 1.1 1998/11/14 22:06:09 tom Exp $")
+MODULE_ID("$Id: lib_winch.c,v 1.8 2010/12/19 01:22:58 tom Exp $")
 
-chtype winch(WINDOW *win)
+NCURSES_EXPORT(chtype)
+winch(WINDOW *win)
 {
-       T((T_CALLED("winch(%p)"), win));
-       if (win != 0) {
-               returnCode(win->_line[win->_cury].text[win->_curx]);
-       } else {
-               returnCode(0);
-       }
+    T((T_CALLED("winch(%p)"), (void *) win));
+    if (win != 0) {
+       returnChtype((chtype) CharOf(win->_line[win->_cury].text[win->_curx])
+                    | AttrOf(win->_line[win->_cury].text[win->_curx]));
+    } else {
+       returnChtype(0);
+    }
 }