[svn-commits] seanbright: trunk r685 - in /trunk: ./ menuselect_curses.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Dec 23 11:59:33 2009
New Revision: 685

URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=685
Log:
Merged revisions 684 via svnmerge from 
https://origsvn.digium.com/svn/menuselect/branches/1.0

........
  r684 | seanbright | 2009-12-23 12:58:54 -0500 (Wed, 23 Dec 2009) | 2 lines
  
  waddstr() on OpenSolaris doesn't take a const char *, so cast to avoid a warning.
........

Modified:
    trunk/   (props changed)
    trunk/menuselect_curses.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.0-merged (original)
+++ branch-1.0-merged Wed Dec 23 11:59:33 2009
@@ -1,1 +1,1 @@
-/branches/1.0:1-316,383,437,465,467,473,475,477,518,676,678,680,682
+/branches/1.0:1-316,383,437,465,467,473,475,477,518,676,678,680,682,684

Modified: trunk/menuselect_curses.c
URL: http://svnview.digium.com/svn/menuselect/trunk/menuselect_curses.c?view=diff&rev=685&r1=684&r2=685
==============================================================================
--- trunk/menuselect_curses.c (original)
+++ trunk/menuselect_curses.c Wed Dec 23 11:59:33 2009
@@ -107,7 +107,7 @@
 	wclear(win);
 	for (i = 0; i < (sizeof(help_info) / sizeof(help_info[0])); i++) {
 		wmove(win, i, max_x / 2 - 15);
-		waddstr(win, help_info[i]);
+		waddstr(win, (char *) help_info[i]);
 	}
 	wrefresh(win);
 	getch(); /* display the help until the user hits a key */
@@ -189,7 +189,7 @@
 
 	if (mem->displayname) {
 		wmove(menu, end - start + 2, max_x / 2 - 16);
-		waddstr(menu, mem->displayname);
+		waddstr(menu, (char *) mem->displayname);
 	}
 	if (!AST_LIST_EMPTY(&mem->deps)) {
 		wmove(menu, end - start + 3, max_x / 2 - 16);
@@ -438,7 +438,7 @@
 	wmove(title, 1, (max_x / 2) - (strlen(titlebar) / 2));
 	waddstr(title, titlebar);
 	wmove(title, 2, (max_x / 2) - (strlen(menu_name) / 2));
-	waddstr(title, menu_name);
+	waddstr(title, (char *) menu_name);
 	wmove(title, 3, (max_x / 2) - (strlen(titlebar) / 2));
 	waddstr(title, titlebar);
 	wmove(title, 5, (max_x / 2) - (strlen(MENU_HELP) / 2));