openbsd-ports/comms/minicom/patches/patch-src_windiv_c
stsp a1212ad29c minicom contains a function called wprintf() (print to a window) which
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
2011-04-22 11:21:46 +00:00

30 lines
950 B
Plaintext

$OpenBSD: patch-src_windiv_c,v 1.3 2011/04/22 11:21:46 stsp Exp $
--- src/windiv.c.orig Wed Oct 11 22:46:21 2006
+++ src/windiv.c Thu Apr 21 23:48:44 2011
@@ -19,6 +19,7 @@
#include "rcsid.h"
RCSID("$Id: patch-src_windiv_c,v 1.3 2011/04/22 11:21:46 stsp Exp $")
+#include <sys/types.h>
#include <dirent.h>
#include <sys/stat.h>
#include "port.h"
@@ -120,7 +121,7 @@ int ask(const char *what, const char **s)
while (1) {
wlocate(w, 2 + offs + 10 * cur, 1);
if (!useattr)
- wprintf(w, ">%s", _(s[cur]) + 1);
+ mc_wprintf(w, ">%s", _(s[cur]) + 1);
else {
wsetattr(w, XA_REVERSE | stdattr);
wputs(w, _(s[cur]));
@@ -169,7 +170,7 @@ char *input(char *s, char *buf)
BDOUBLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
wputs(w, s);
wlocate(w, 0, 1);
- wprintf(w, "> %-38.38s", buf);
+ mc_wprintf(w, "> %-38.38s", buf);
wlocate(w, 2, 1);
if (wgets(w, buf, 38, 128) < 0)
buf = NULL;