-#define MvAddCh (void) mvaddch
-#define MvWAddCh (void) mvwaddch
-#define MvAddStr (void) mvaddstr
-#define MvWAddStr (void) mvwaddstr
-#define MvWAddChStr (void) mvwaddchstr
-#define MvPrintw (void) mvprintw
-#define MvWPrintw (void) mvwprintw
-#define MvHLine (void) mvhline
-#define MvWHLine (void) mvwhline
-#define MvVLine (void) mvvline
-#define MvWVLine (void) mvwvline
+#define AddCh(c) (void) addch((chtype)(c))
+#define WAddCh(w,c) (void) waddch((w),(chtype)(c))
+#define MvAddCh(y,x,c) (void) mvaddch((y),(x),(chtype)(c))
+#define MvWAddCh(w,y,x,c) (void) mvwaddch((w),(y),(x),(chtype)(c))
+#define MvAddStr(y,x,s) (void) mvaddstr((y),(x),(s))
+#define MvWAddStr(w,y,x,s) (void) mvwaddstr((w),(y),(x),(s))
+#define MvWAddChStr(w,y,x,s) (void) mvwaddchstr((w),(y),(x),(s))
+#define MvPrintw (void) mvprintw
+#define MvWPrintw (void) mvwprintw
+#define MvHLine (void) mvhline
+#define MvWHLine (void) mvwhline
+#define MvVLine (void) mvvline
+#define MvWVLine (void) mvwvline