ncurses 5.7 - patch 20110122

[ncurses.git] / include / curses.h.in

diff --git a/include/curses.h.in b/include/curses.h.in
index a25b9d5cd226cc788a23e2e1a0b2afc57838b3e1..5774154e85383656b170a3114c3f4acecb728514 100644 (file)
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.214 2010/03/30 08:50:18 tom Exp $ */
+/* $Id: curses.h.in,v 1.220 2011/01/22 19:47:20 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -144,6 +144,11 @@ typedef unsigned @cf_cv_typeof_chtype@ chtype;
 typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
 #endif
 
+/*
+ * We need FILE, etc.  Include this before checking any feature symbols.
+ */
+#include <stdio.h>
+
 /*
  * With XPG4, you must define _XOPEN_SOURCE_EXTENDED, it is redundant (or
  * conflicting) when _XOPEN_SOURCE is 500 or greater.
@@ -153,7 +158,6 @@ typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
 #define NCURSES_WIDECHAR
 #endif
 
-#include <stdio.h>
 #include <stdarg.h>    /* we need va_list */
 #ifdef NCURSES_WIDECHAR
 #include <stddef.h>    /* we want wchar_t */
@@ -1093,7 +1097,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);     /*
 
 /* It seems older SYSV curses versions define these */
 #if !NCURSES_OPAQUE
-#define getattrs(win)          ((win) ? (win)->_attrs : A_NORMAL)
+#define getattrs(win)          NCURSES_CAST(int, (win) ? (win)->_attrs : A_NORMAL)
 #define getcurx(win)           ((win) ? (win)->_curx : ERR)
 #define getcury(win)           ((win) ? (win)->_cury : ERR)
 #define getbegx(win)           ((win) ? (win)->_begx : ERR)
@@ -1114,12 +1118,12 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);   /*
 #if defined(NCURSES_WIDECHAR) && @NCURSES_EXT_COLORS@
 #define wattrset(win,at)       ((win) \
                                  ? ((win)->_color = PAIR_NUMBER(at), \
-                                     (win)->_attrs = (at), \
+                                     (win)->_attrs = NCURSES_CAST(attr_t, at), \
                                      OK) \
                                  : ERR)
 #else
 #define wattrset(win,at)        ((win) \
-                                 ? ((win)->_attrs = (at), \
+                                 ? ((win)->_attrs = NCURSES_CAST(attr_t, at), \
                                     OK) \
                                  : ERR)
 #endif
@@ -1151,7 +1155,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);     /*
  * These apply to the first 256 color pairs.
  */
 #define COLOR_PAIR(n)  NCURSES_BITS(n, 0)
-#define PAIR_NUMBER(a) (NCURSES_CAST(int,(((a) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
+#define PAIR_NUMBER(a) (NCURSES_CAST(int,((NCURSES_CAST(unsigned long,a) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
 
 /*
  * pseudo functions for standard screen
@@ -1264,12 +1268,12 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);   /*
                                         (win)->_color = (p), \
                                         OK)
 #define wattr_get(win,a,p,opts)                ((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-                                        (void)((p) != (void *)0 && (*(p) = (win)->_color)), \
+                                        (void)((p) != (void *)0 && (*(p) = (short)(win)->_color)), \
                                         OK)
 #else
-#define wattr_set(win,a,p,opts)                ((win)->_attrs = (((a) & ~A_COLOR) | COLOR_PAIR(p)), OK)
+#define wattr_set(win,a,p,opts)                ((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p)), OK)
 #define wattr_get(win,a,p,opts)                ((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-                                        (void)((p) != (void *)0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
+                                        (void)((p) != (void *)0 && (*(p) = (short)PAIR_NUMBER((win)->_attrs))), \
                                         OK)
 #endif
 #endif /* NCURSES_OPAQUE */