diff options
| author | Wayne Davison <wayned@samba.org> | 2007-04-26 05:53:13 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-04-26 05:53:13 +0000 |
| commit | 332cf6df7c32dbaa47cbfe515121da7bd53974e8 (patch) | |
| tree | 841489996c20d0ca87e04bea3f3f213e864b1676 /rsync.h | |
| parent | 3f7afe7ec1cc499c811e1455bb5ff8748cd2a07a (diff) | |
| download | rsync-332cf6df7c32dbaa47cbfe515121da7bd53974e8.tar.gz rsync-332cf6df7c32dbaa47cbfe515121da7bd53974e8.tar.bz2 rsync-332cf6df7c32dbaa47cbfe515121da7bd53974e8.zip | |
The --iconv option has now made it to the trunk.
Diffstat (limited to 'rsync.h')
| -rw-r--r-- | rsync.h | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -362,6 +362,15 @@ enum msgcode { # include <limits.h> #endif +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#include <iconv.h> +#ifndef ICONV_CONST +#define ICONV_CONST +#endif +#elif defined ICONV_CONST +#undef ICONV_CONST +#endif + #include <assert.h> #include "lib/pool_alloc.h" @@ -609,6 +618,7 @@ extern int preserve_xattrs; #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num #define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num +#define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num /* These items are per-entry optional and mutally exclusive: */ #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num @@ -665,7 +675,7 @@ extern int preserve_xattrs; struct file_list { struct file_list *next, *prev; - struct file_struct **files; + struct file_struct **files, **sorted; alloc_pool_t file_pool; int count, malloced; int low, high; /* 0-relative index values excluding empties */ |