[evolution-ews/gnome-3-8] Prepend ews_ to lzx functions lifted from libmspack to avoid conflicts (cherry picked from commit 67

[David Woodhouse <dwmw2 src gnome org>]

commit f4325172c4377ae2aafc8bb543b1b569b33a1750
Author: David Woodhouse <David Woodhouse intel com>
Date:   Wed May 15 17:51:08 2013 +0100

    Prepend ews_ to lzx functions lifted from libmspack to avoid conflicts
    (cherry picked from commit 67ac9ae074185a42440b4f43436f4c5e6d50271f)

 src/addressbook/mspack/lzx.h            |   10 +++++-----
 src/addressbook/mspack/lzxd.c           |   10 +++++-----
 src/addressbook/mspack/oab-decompress.c |   10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/src/addressbook/mspack/lzx.h b/src/addressbook/mspack/lzx.h
index ceb1264..a861f26 100644
--- a/src/addressbook/mspack/lzx.h
+++ b/src/addressbook/mspack/lzx.h
@@ -171,7 +171,7 @@ struct lzxd_stream {
  * @return a pointer to an initialised lzxd_stream structure, or NULL if
  * there was not enough memory or parameters to the function were wrong.
  */
-extern struct lzxd_stream *lzxd_init(FILE *input,
+extern struct lzxd_stream *ews_lzxd_init(FILE *input,
                                     FILE *output,
                                     int window_bits,
                                     int reset_interval,
@@ -180,7 +180,7 @@ extern struct lzxd_stream *lzxd_init(FILE *input,
                                      char is_delta);
 
 /* see description of output_length in lzxd_init() */
-extern void lzxd_set_output_length(struct lzxd_stream *lzx,
+extern void ews_lzxd_set_output_length(struct lzxd_stream *lzx,
                                   off_t output_length);
 
 /**
@@ -195,7 +195,7 @@ extern void lzxd_set_output_length(struct lzxd_stream *lzx,
  *               than the LZX window size.
  * @return an error code, or LZX_ERR_OK if successful
  */
-extern int lzxd_set_reference_data(struct lzxd_stream *lzx,
+extern int ews_lzxd_set_reference_data(struct lzxd_stream *lzx,
                                    FILE *input,
                                    unsigned int length);
 
@@ -226,7 +226,7 @@ extern int lzxd_set_reference_data(struct lzxd_stream *lzx,
  * @param out_bytes the number of bytes of data to decompress.
  * @return an error code, or LZX_ERR_OK if successful
  */
-extern int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes);
+extern int ews_lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes);
 
 /**
  * Frees all state associated with an LZX data stream. This will call
@@ -234,6 +234,6 @@ extern int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes);
  *
  * @param lzx LZX decompression state to free.
  */
-void lzxd_free(struct lzxd_stream *lzx);
+void ews_lzxd_free(struct lzxd_stream *lzx);
 
 #endif
diff --git a/src/addressbook/mspack/lzxd.c b/src/addressbook/mspack/lzxd.c
index f6bd4c9..efb584b 100644
--- a/src/addressbook/mspack/lzxd.c
+++ b/src/addressbook/mspack/lzxd.c
@@ -275,7 +275,7 @@ static void lzxd_reset_state(struct lzxd_stream *lzx) {
 
 /*-------- main LZX code --------*/
 
-struct lzxd_stream *lzxd_init(FILE *input,
+struct lzxd_stream *ews_lzxd_init(FILE *input,
                              FILE *output,
                              int window_bits,
                              int reset_interval,
@@ -340,7 +340,7 @@ struct lzxd_stream *lzxd_init(FILE *input,
   return lzx;
 }
 
-int lzxd_set_reference_data(struct lzxd_stream *lzx,
+int ews_lzxd_set_reference_data(struct lzxd_stream *lzx,
                            FILE *input,
                            unsigned int length)
 {
@@ -374,11 +374,11 @@ int lzxd_set_reference_data(struct lzxd_stream *lzx,
     return LZX_ERR_OK;
 }
 
-void lzxd_set_output_length(struct lzxd_stream *lzx, off_t out_bytes) {
+void ews_lzxd_set_output_length(struct lzxd_stream *lzx, off_t out_bytes) {
   if (lzx) lzx->length = out_bytes;
 }
 
-int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
+int ews_lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
   /* bitstream and huffman reading variables */
   register unsigned int bit_buffer;
   register int bits_left, i=0;
@@ -877,7 +877,7 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
   return LZX_ERR_OK;
 }
 
-void lzxd_free(struct lzxd_stream *lzx) {
+void ews_lzxd_free(struct lzxd_stream *lzx) {
   if (lzx) {
     free(lzx->inbuf);
     free(lzx->window);
diff --git a/src/addressbook/mspack/oab-decompress.c b/src/addressbook/mspack/oab-decompress.c
index d118e44..5161e6c 100644
--- a/src/addressbook/mspack/oab-decompress.c
+++ b/src/addressbook/mspack/oab-decompress.c
@@ -219,14 +219,14 @@ ews_oab_decompress_full (const gchar *filename, const gchar *output_filename,
                        else if (window_bits > 25)
                                window_bits = 25;
 
-                       lzs = lzxd_init (input, output, window_bits,
+                       lzs = ews_lzxd_init (input, output, window_bits,
                                         0, 4096, lzx_b->ucomp_size, 1);
                        if (!lzs) {
                                g_set_error_literal (&err, g_quark_from_string ("lzx"), 1, "decompression 
failed (lzxd_init)");
                                ret = FALSE;
                                goto exit;
                        }
-                       if (lzxd_decompress (lzs, lzx_b->ucomp_size) != LZX_ERR_OK) {
+                       if (ews_lzxd_decompress (lzs, lzx_b->ucomp_size) != LZX_ERR_OK) {
                                g_set_error_literal (&err, g_quark_from_string ("lzx"), 1, "decompression 
failed (lzxd_decompress)");
                                ret = FALSE;
                                goto exit;
@@ -431,19 +431,19 @@ ews_oab_decompress_patch (const gchar *filename, const gchar *orig_filename,
                else if (window_bits > 25)
                        window_bits = 25;
 
-               lzs = lzxd_init (input, output, window_bits,
+               lzs = ews_lzxd_init (input, output, window_bits,
                                 0, 4096, lzx_b->target_size, 1);
                if (!lzs) {
                        g_set_error_literal (&err, g_quark_from_string ("lzx"), 1, "decompression failed 
(lzxd_init)");
                        ret = FALSE;
                        goto exit;
                }
-               if (lzxd_set_reference_data(lzs, orig_input, lzx_b->source_size)) {
+               if (ews_lzxd_set_reference_data(lzs, orig_input, lzx_b->source_size)) {
                        g_set_error_literal (&err, g_quark_from_string ("lzx"), 1, "decompression failed 
(lzxd_set_reference_data)");
                        ret = FALSE;
                        goto exit;
                }
-               if (lzxd_decompress (lzs, lzs->length) != LZX_ERR_OK) {
+               if (ews_lzxd_decompress (lzs, lzs->length) != LZX_ERR_OK) {
                        g_set_error_literal (&err, g_quark_from_string ("lzx"), 1, "decompression failed 
(lzxd_decompress)");
                        ret = FALSE;
                        goto exit;