projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* doc/headers/assert.texi (assert.h): Document assert module use.
[gnulib.git]
/
lib
/
mbchar.h
diff --git
a/lib/mbchar.h
b/lib/mbchar.h
index
4472aa0
..
f3e28ef
100644
(file)
--- a/
lib/mbchar.h
+++ b/
lib/mbchar.h
@@
-1,5
+1,5
@@
/* Multibyte character data type.
/* Multibyte character data type.
- Copyright (C) 2001, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005
-2006
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-155,9
+155,10
@@
#include <stdio.h>
#include <time.h>
#include <wchar.h>
#include <stdio.h>
#include <time.h>
#include <wchar.h>
-
#include <wctype.h>
#include <wctype.h>
+#include "wcwidth.h"
+
#define MBCHAR_BUF_SIZE 24
struct mbchar
#define MBCHAR_BUF_SIZE 24
struct mbchar
@@
-259,18
+260,18
@@
mb_width_aux (wint_t wc)
/* Copying a character. */
static inline void
/* Copying a character. */
static inline void
-mb_copy (mbchar_t *new
, const mbchar_t *old
)
+mb_copy (mbchar_t *new
_mbc, const mbchar_t *old_mbc
)
{
{
- if (old
->ptr == &old
->buf[0])
+ if (old
_mbc->ptr == &old_mbc
->buf[0])
{
{
- memcpy (&new
->buf[0], &old->buf[0], old
->bytes);
- new
->ptr = &new
->buf[0];
+ memcpy (&new
_mbc->buf[0], &old_mbc->buf[0], old_mbc
->bytes);
+ new
_mbc->ptr = &new_mbc
->buf[0];
}
else
}
else
- new
->ptr = old
->ptr;
- new
->bytes = old
->bytes;
- if ((new
->wc_valid = old
->wc_valid))
- new
->wc = old
->wc;
+ new
_mbc->ptr = old_mbc
->ptr;
+ new
_mbc->bytes = old_mbc
->bytes;
+ if ((new
_mbc->wc_valid = old_mbc
->wc_valid))
+ new
_mbc->wc = old_mbc
->wc;
}
}
@@
-304,7
+305,7
@@
mb_copy (mbchar_t *new, const mbchar_t *old)
/* The character set is ISO-646, not EBCDIC. */
# define IS_BASIC_ASCII 1
/* The character set is ISO-646, not EBCDIC. */
# define IS_BASIC_ASCII 1
-extern unsigned int is_basic_table[];
+extern
const
unsigned int is_basic_table[];
static inline bool
is_basic (char c)
static inline bool
is_basic (char c)