From b43828b247fd4f1e0373584de0504004c69eeac9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 8 Jun 2012 16:55:35 -0700 Subject: libsparse: rename symbols that conflict with libext4_utils Until ext4_utils switches to using libsparse, libext4_utils defines some of the same symbols as libsparse. Fastboot links statically against both of them, and there is no easy way to make the symbols hidden, so just rename them in libsparse. Change-Id: Idc2cfe20efe3c3a7fb8233f453a89bbbeb0dcc8b --- libsparse/output_file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libsparse/output_file.c') diff --git a/libsparse/output_file.c b/libsparse/output_file.c index dc56149e7..b5ae4191f 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c @@ -541,7 +541,7 @@ static struct sparse_file_ops normal_file_ops = { .write_end_chunk = write_normal_end_chunk, }; -void close_output_file(struct output_file *out) +void output_file_close(struct output_file *out) { int ret; @@ -638,7 +638,7 @@ static struct output_file *output_file_new_normal(void) return &outn->out; } -struct output_file *open_output_callback(int (*write)(void *, const void *, int), +struct output_file *output_file_open_callback(int (*write)(void *, const void *, int), void *priv, unsigned int block_size, int64_t len, int gz, int sparse, int chunks, int crc) { @@ -664,7 +664,7 @@ struct output_file *open_output_callback(int (*write)(void *, const void *, int) return &outc->out; } -struct output_file *open_output_fd(int fd, unsigned int block_size, int64_t len, +struct output_file *output_file_open_fd(int fd, unsigned int block_size, int64_t len, int gz, int sparse, int chunks, int crc) { int ret; -- cgit v1.2.3