diff options
| author | Dylan Simon <dylan@dylex.net> | 2010-03-08 22:01:26 -0500 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-08-19 00:12:12 +0300 |
| commit | 432373ecf8e1f702e4c82afac9a61d2b96445187 (patch) | |
| tree | 9f6430d4d1145395134a549cfdeb0274333ded48 /flist.c | |
| parent | 7cb0de6326c915a72253fd103dae93308031ec3f (diff) | |
| download | android_external_rsync-432373ecf8e1f702e4c82afac9a61d2b96445187.tar.gz android_external_rsync-432373ecf8e1f702e4c82afac9a61d2b96445187.tar.bz2 android_external_rsync-432373ecf8e1f702e4c82afac9a61d2b96445187.zip | |
Android build, static config, and changes
Works fine on emulator both for local copies and in daemon mode. Very few changes necessary.
Change-Id: I6ef54769b00333f84eabd1306381eac80b3d5f09
Diffstat (limited to 'flist.c')
| -rw-r--r-- | flist.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -90,7 +90,7 @@ extern iconv_t ic_send, ic_recv; int io_error; int checksum_len; -dev_t filesystem_dev; /* used to implement -x */ +DEV_T filesystem_dev; /* used to implement -x */ struct file_list *cur_flist, *first_flist, *dir_flist; int send_dir_ndx = -1, send_dir_depth = -1; @@ -119,7 +119,7 @@ int flist_eof = 0; /* all the file-lists are now known */ /* The tmp_* vars are used as a cache area by make_file() to store data * that the sender doesn't need to remember in its file list. The data * will survive just long enough to be used by send_file_entry(). */ -static dev_t tmp_rdev; +static DEV_T tmp_rdev; #ifdef SUPPORT_HARD_LINKS static int64 tmp_dev = -1, tmp_ino; #endif @@ -402,7 +402,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif - static dev_t rdev; + static DEV_T rdev; static uint32 rdev_major; static uid_t uid; static gid_t gid; @@ -675,7 +675,7 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x #ifdef SUPPORT_HARD_LINKS static int64 dev; #endif - static dev_t rdev; + static DEV_T rdev; static uint32 rdev_major; static uid_t uid; static gid_t gid; @@ -849,7 +849,7 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x || (preserve_specials && IS_SPECIAL(mode) && protocol_version < 31)) { if (protocol_version < 28) { if (!(xflags & XMIT_SAME_RDEV_pre28)) - rdev = (dev_t)read_int(f); + rdev = (DEV_T)read_int(f); } else { uint32 rdev_minor; if (!(xflags & XMIT_SAME_RDEV_MAJOR)) |