Mercurial > audlegacy
comparison audtool/audtool.c @ 1953:e00f2d82233b trunk
[svn] - build fix
| author | yaz |
|---|---|
| date | Sun, 05 Nov 2006 22:26:49 -0800 |
| parents | 78e8d9dd5036 |
| children | 8feb3d69b5be |
comparison
equal
deleted
inserted
replaced
| 1952:52dda29aa5e0 | 1953:e00f2d82233b |
|---|---|
| 520 if(songname){ | 520 if(songname){ |
| 521 p = songname; | 521 p = songname; |
| 522 while(*p){ | 522 while(*p){ |
| 523 gint stride; | 523 gint stride; |
| 524 stride = g_utf8_next_char(p) - p; | 524 stride = g_utf8_next_char(p) - p; |
| 525 if(g_unichar_iswide(g_utf8_get_char(p)) || | 525 if(g_unichar_iswide(g_utf8_get_char(p)) |
| 526 #if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 12) | 526 #if ( (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION >= 12) ) |
| 527 || g_unichar_iswide_cjk(g_utf8_get_char(p)) | 527 || g_unichar_iswide_cjk(g_utf8_get_char(p)) |
| 528 #endif | 528 #endif |
| 529 ){ | 529 ){ |
| 530 column += (stride - 2); | 530 column += (stride - 2); |
| 531 } | 531 } |
| 789 if(songname) { | 789 if(songname) { |
| 790 p = songname; | 790 p = songname; |
| 791 while(*p){ | 791 while(*p){ |
| 792 gint stride; | 792 gint stride; |
| 793 stride = g_utf8_next_char(p) - p; | 793 stride = g_utf8_next_char(p) - p; |
| 794 if(g_unichar_iswide(g_utf8_get_char(p)) || | 794 if(g_unichar_iswide(g_utf8_get_char(p)) |
| 795 g_unichar_iswide_cjk(g_utf8_get_char(p))){ | 795 #if ( (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION >= 12) ) |
| 796 || g_unichar_iswide_cjk(g_utf8_get_char(p)) | |
| 797 #endif | |
| 798 ){ | |
| 796 column += (stride - 2); | 799 column += (stride - 2); |
| 797 } | 800 } |
| 798 else { | 801 else { |
| 799 column += (stride - 1); | 802 column += (stride - 1); |
| 800 } | 803 } |