a1212ad29c
collides with the standard C wprintf() (print a wide character string). Upstream already realised this was a bad idea and changed the function's name to mc_wprintf(). Do the same for our port. ok ajacoutot landry dcoppa
22 lines
765 B
Plaintext
22 lines
765 B
Plaintext
$OpenBSD: patch-src_window_c,v 1.3 2011/04/22 11:21:46 stsp Exp $
|
|
--- src/window.c.orig Thu Apr 21 23:48:56 2011
|
|
+++ src/window.c Thu Apr 21 23:49:02 2011
|
|
@@ -1146,7 +1146,7 @@ void wputs(WIN *win, const char *s)
|
|
* Print a formatted string in a window.
|
|
* Should return stringlength - but who cares.
|
|
*/
|
|
-int wprintf(WIN *win, const char *fmt, ...)
|
|
+int mc_wprintf(WIN *win, const char *fmt, ...)
|
|
{
|
|
char buf[160];
|
|
va_list va;
|
|
@@ -1304,7 +1304,7 @@ int wselect(int x, int y, const char *const *choices,
|
|
wtitle(w, TMID, title);
|
|
|
|
for (c = 0; c < count; c++)
|
|
- wprintf(w, " %s%s", _(choices[c]), c == count - 1 ? "" : "\n");
|
|
+ mc_wprintf(w, " %s%s", _(choices[c]), c == count - 1 ? "" : "\n");
|
|
|
|
wcurbar(w, cur, high_on);
|
|
wredraw(w, 1);
|