diff options
| author | James Peach <jpeach@samba.org> | 2007-11-21 18:31:35 -0800 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-11-21 18:31:35 -0800 |
| commit | 64b54e534008a1ac36b9ba21726ca0954fe00d63 (patch) | |
| tree | 5a5e0f42c70d4afa14ba689bf4f97af321432510 /source3/lib/charcnv.c | |
| parent | febaaae2021c2993d265cc48cf9fbef05cb4ed1b (diff) | |
| parent | 7ef6c19074495110d5c0b698b05c4ee52a0744d6 (diff) | |
| download | samba-64b54e534008a1ac36b9ba21726ca0954fe00d63.tar.gz samba-64b54e534008a1ac36b9ba21726ca0954fe00d63.tar.bz2 samba-64b54e534008a1ac36b9ba21726ca0954fe00d63.zip | |
Merge ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 660ea443364e949ed06c28b00f0e1c3757f0da27)
Diffstat (limited to 'source3/lib/charcnv.c')
| -rw-r--r-- | source3/lib/charcnv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index da972f550f..0dfa88e87e 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -932,7 +932,7 @@ char *strdup_lower(const char *s) return out_buffer; } -static size_t ucs2_align(const void *base_ptr, const void *p, int flags) +size_t ucs2_align(const void *base_ptr, const void *p, int flags) { if (flags & (STR_NOALIGN|STR_ASCII)) return 0; |