From d4b3d7584914d22d357424bb657caa1906a5da33 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 1 Jun 2017 11:46:21 +0200
Subject: Avoid name conflict with libwmf (wmf_free).

(bzr r15703.1.21)
---
 src/libuemf/uwmf.c | 3 ++-
 src/libuemf/uwmf.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/libuemf')

diff --git a/src/libuemf/uwmf.c b/src/libuemf/uwmf.c
index 62e3d3c06..50e4075d8 100644
--- a/src/libuemf/uwmf.c
+++ b/src/libuemf/uwmf.c
@@ -1517,8 +1517,9 @@ int  wmf_start(
     \brief Release memory for an wmf structure in memory. Call this after wmf_finish().
     \return 0 on success, >=1 on failure
     \param wt WMF in memory
+    Renamed to uwmf_free to avoid conflict with libwmf
 */
-int wmf_free(
+int uwmf_free(
       WMFTRACK **wt
    ){    
    WMFTRACK *wtl;
diff --git a/src/libuemf/uwmf.h b/src/libuemf/uwmf.h
index 138ffab37..529232ca9 100644
--- a/src/libuemf/uwmf.h
+++ b/src/libuemf/uwmf.h
@@ -2078,7 +2078,7 @@ typedef struct {
 // Prototypes (_set first, then _get)
 char        *wmr_dup(const char *wmr);
 int          wmf_start(const char *name, uint32_t initsize, uint32_t chunksize, WMFTRACK **wt);
-int          wmf_free(WMFTRACK **wt);
+int          uwmf_free(WMFTRACK **wt);
 int          wmf_finish(WMFTRACK *wt);
 int          wmf_append(U_METARECORD *rec, WMFTRACK *wt, int freerec);
 int          wmf_header_append(U_METARECORD *rec,WMFTRACK *et, int freerec);
-- 
cgit v1.2.3