summaryrefslogtreecommitdiff
path: root/lib/util/charset/charset.h
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-04-24 09:17:08 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-04-24 09:17:08 +0200
commit2ee9ee2c17ce435ce45a773f19302a7b474554c2 (patch)
tree2ea91c2d36664f02e001575be0591660190d86ed /lib/util/charset/charset.h
parentb82a204b9b2c28707ab7866a511ea4f5912826ac (diff)
parentaf6316d1500cfcedd5fd59ed0ddbba9aec9c3756 (diff)
downloadsamba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.gz
samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.bz2
samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'lib/util/charset/charset.h')
-rw-r--r--lib/util/charset/charset.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 37c5acafaf..2c8aa41ad5 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -151,11 +151,12 @@ ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
extern struct smb_iconv_convenience *global_iconv_convenience;
codepoint_t next_codepoint(const char *str, size_t *size);
+ssize_t push_codepoint(char *str, codepoint_t c);
/* codepoints */
codepoint_t next_codepoint_convenience(struct smb_iconv_convenience *ic,
const char *str, size_t *size);
-ssize_t push_codepoint(struct smb_iconv_convenience *ic,
+ssize_t push_codepoint_convenience(struct smb_iconv_convenience *ic,
char *str, codepoint_t c);
codepoint_t toupper_m(codepoint_t val);
codepoint_t tolower_m(codepoint_t val);