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

diff --git a/putty.h b/putty.h
index 85e058a..eebd3da 100644 (file)
--- 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 1e0a9fe..dc2392e 100644 (file)
--- 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 5bc1885..358ba4f 100644 (file)
--- 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 78cb1e0..9fa45ba 100644 (file)
--- 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;