From 2102eb8a3a40dbf18235c73cf23f018f411db9bc Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 9 Nov 2002 21:46:21 +0000 Subject: [PATCH] Rename CharWidth() to char_width(). The former name clashes with an API function in Mac OS. git-svn-id: svn://svn.tartarus.org/sgt/putty@2205 cda61777-01e9-0310-a592-d414129be87e --- putty.h | 2 +- terminal.c | 2 +- unix/pterm.c | 2 +- window.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/putty.h b/putty.h index 85e058ae..eebd3da3 100644 --- a/putty.h +++ b/putty.h @@ -403,7 +403,7 @@ struct RSAKey; /* be a little careful of scope */ void request_resize(void *frontend, int, int); void do_text(Context, int, int, char *, int, unsigned long, int); void do_cursor(Context, int, int, char *, int, unsigned long, int); -int CharWidth(Context ctx, int uc); +int char_width(Context ctx, int uc); void set_title(void *frontend, char *); void set_icon(void *frontend, char *); void set_sbar(void *frontend, int, int, int); diff --git a/terminal.c b/terminal.c index 1e0a9fe4..dc2392ef 100644 --- a/terminal.c +++ b/terminal.c @@ -2983,7 +2983,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise) */ if ((tchar | tattr) != (term->disptext[idx]& ~ATTR_NARROW)) { if ((tattr & ATTR_WIDE) == 0 && - CharWidth(ctx, (tchar | tattr) & 0xFFFF) == 2) + char_width(ctx, (tchar | tattr) & 0xFFFF) == 2) tattr |= ATTR_NARROW; } else if (term->disptext[idx]&ATTR_NARROW) tattr |= ATTR_NARROW; diff --git a/unix/pterm.c b/unix/pterm.c index 5bc18856..358ba4f6 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -1352,7 +1352,7 @@ void beep(void *frontend, int mode) gdk_beep(); } -int CharWidth(Context ctx, int uc) +int char_width(Context ctx, int uc) { /* * Under X, any fixed-width font really _is_ fixed-width. diff --git a/window.c b/window.c index 78cb1e09..9fa45bae 100644 --- a/window.c +++ b/window.c @@ -2997,7 +2997,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, /* This function gets the actual width of a character in the normal font. */ -int CharWidth(Context ctx, int uc) { +int char_width(Context ctx, int uc) { HDC hdc = ctx; int ibuf = 0; -- 2.11.0