diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-02 05:04:07 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-02 05:04:07 +0100 |
| commit | 0a3ee53b50a10874b0ee0230b022b4277b5a6d96 (patch) | |
| tree | d4be5d3311e88825d7b4d02d6fea2f499650b0ef | |
| parent | 2d7a3748b2063c4137ee98ceca85361651ef8ee7 (diff) | |
| download | samba-0a3ee53b50a10874b0ee0230b022b4277b5a6d96.tar.gz samba-0a3ee53b50a10874b0ee0230b022b4277b5a6d96.tar.bz2 samba-0a3ee53b50a10874b0ee0230b022b4277b5a6d96.zip | |
Use samba3's own iconv implementation for now, until all changes are
merged.
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/lib/iconv.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 28b5437838..e9f408189d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -366,7 +366,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/substitute.o lib/dbwrap_util.o \ lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \ lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \ - ../lib/util/charset/iconv.o lib/pam_errors.o intl/lang_tdb.o \ + lib/iconv.o lib/pam_errors.o intl/lang_tdb.o \ lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \ lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \ lib/ldap_escape.o @CHARSET_STATIC@ \ diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c index fa213a37c0..44500542f2 100644 --- a/source3/lib/iconv.c +++ b/source3/lib/iconv.c @@ -207,12 +207,12 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode) from = charsets; to = charsets; - ret = SMB_MALLOC_P(smb_iconv_t); + ret = SMB_MALLOC_P(struct smb_iconv_s); if (!ret) { errno = ENOMEM; return (smb_iconv_t)-1; } - memset(ret, 0, sizeof(smb_iconv_t)); + memset(ret, 0, sizeof(struct smb_iconv_s)); ret->from_name = SMB_STRDUP(fromcode); ret->to_name = SMB_STRDUP(tocode); |