From 0b675aae174b31c555284feb1080afd77fded976 Mon Sep 17 00:00:00 2001
From: Rafael Antognolli <antognolli@gmail.com>
Date: Fri, 22 Jun 2012 20:56:53 +0000
Subject: [PATCH] evas/cserve2: Change our fash implemenation name. So the
 names won't clash.

SVN revision: 72701
---
 legacy/evas/src/bin/evas_cserve2_cache.c      |  2 +-
 legacy/evas/src/lib/cserve2/evas_cs2_client.c |  8 ++++----
 legacy/evas/src/lib/cserve2/evas_cs2_utils.c  | 18 +++++++++---------
 legacy/evas/src/lib/cserve2/evas_cs2_utils.h  | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/legacy/evas/src/bin/evas_cserve2_cache.c b/legacy/evas/src/bin/evas_cserve2_cache.c
index 23a6902d3b..63219c04f7 100644
--- a/legacy/evas/src/bin/evas_cserve2_cache.c
+++ b/legacy/evas/src/bin/evas_cserve2_cache.c
@@ -108,7 +108,7 @@ struct _Font_Entry {
    unsigned int dpi;
    Font_Source *src;
    void *ft;
-   Fash_Glyph *glyphs;
+   Fash_Glyph2 *glyphs;
    Eina_Inlist *caches;
    Font_Cache *last_cache;
    Eina_Bool unused : 1;
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_client.c b/legacy/evas/src/lib/cserve2/evas_cs2_client.c
index ddf0186bbc..1d192294b9 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_client.c
+++ b/legacy/evas/src/lib/cserve2/evas_cs2_client.c
@@ -792,7 +792,7 @@ struct _Font_Entry
    unsigned int rid; // open
 
    Eina_Hash *glyphs_maps;
-   Fash_Glyph *fash[3]; // one per hinting value
+   Fash_Glyph2 *fash[3]; // one per hinting value
 
    Eina_Clist glyphs_queue;
    int glyphs_queue_count;
@@ -1163,7 +1163,7 @@ _glyph_request_server_send(Font_Entry *fe, Font_Hint_Flags hints, Eina_Bool used
 Eina_Bool
 evas_cserve2_font_glyph_request(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints)
 {
-   Fash_Glyph *fash;
+   Fash_Glyph2 *fash;
    CS_Glyph_Out *glyph;
 
    if (fe->rid)
@@ -1208,7 +1208,7 @@ evas_cserve2_font_glyph_request(Font_Entry *fe, unsigned int idx, Font_Hint_Flag
 Eina_Bool
 evas_cserve2_font_glyph_used(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints)
 {
-   Fash_Glyph *fash;
+   Fash_Glyph2 *fash;
    CS_Glyph_Out *glyph;
 
    if (fe->rid)
@@ -1244,7 +1244,7 @@ evas_cserve2_font_glyph_used(Font_Entry *fe, unsigned int idx, Font_Hint_Flags h
 RGBA_Font_Glyph_Out *
 evas_cserve2_font_glyph_bitmap_get(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints)
 {
-   Fash_Glyph *fash;
+   Fash_Glyph2 *fash;
    CS_Glyph_Out *out;
 
    if (fe->failed)
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_utils.c b/legacy/evas/src/lib/cserve2/evas_cs2_utils.c
index 5323000b63..b1a3df28ea 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_utils.c
+++ b/legacy/evas/src/lib/cserve2/evas_cs2_utils.c
@@ -23,14 +23,14 @@ struct _Fash_Glyph_Map2
    Fash_Glyph_Map *bucket[256];
 };
 
-struct _Fash_Glyph
+struct _Fash_Glyph2
 {
    Fash_Glyph_Map2 *bucket[256];
    void (*free_cb)(void *glyph);
 };
 
 static void
-_fash_item_free(Fash_Glyph *fash, Fash_Glyph_Map *map)
+_fash_item_free(Fash_Glyph2 *fash, Fash_Glyph_Map *map)
 {
    int i;
 
@@ -42,7 +42,7 @@ _fash_item_free(Fash_Glyph *fash, Fash_Glyph_Map *map)
 }
 
 static void
-_fash_gl2_free(Fash_Glyph *fash, Fash_Glyph_Map2 *fash2)
+_fash_gl2_free(Fash_Glyph2 *fash, Fash_Glyph_Map2 *fash2)
 {
    int i;
 
@@ -52,7 +52,7 @@ _fash_gl2_free(Fash_Glyph *fash, Fash_Glyph_Map2 *fash2)
 }
 
 void
-fash_gl_free(Fash_Glyph *fash)
+fash_gl_free(Fash_Glyph2 *fash)
 {
    int i;
 
@@ -61,16 +61,16 @@ fash_gl_free(Fash_Glyph *fash)
    free(fash);
 }
 
-Fash_Glyph *
+Fash_Glyph2 *
 fash_gl_new(void (*free_cb)(void *glyph))
 {
-   Fash_Glyph *fash = calloc(1, sizeof(Fash_Glyph));
+   Fash_Glyph2 *fash = calloc(1, sizeof(Fash_Glyph2));
    fash->free_cb = free_cb;
    return fash;
 }
 
 void *
-fash_gl_find(Fash_Glyph *fash, int item)
+fash_gl_find(Fash_Glyph2 *fash, int item)
 {
    int grp, maj, min;
 
@@ -84,7 +84,7 @@ fash_gl_find(Fash_Glyph *fash, int item)
 }
 
 void
-fash_gl_add(Fash_Glyph *fash, int item, void *glyph)
+fash_gl_add(Fash_Glyph2 *fash, int item, void *glyph)
 {
    int grp, maj, min;
 
@@ -102,7 +102,7 @@ fash_gl_add(Fash_Glyph *fash, int item, void *glyph)
 }
 
 void
-fash_gl_del(Fash_Glyph *fash, int item)
+fash_gl_del(Fash_Glyph2 *fash, int item)
 {
    int grp, maj, min;
    void *data;
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_utils.h b/legacy/evas/src/lib/cserve2/evas_cs2_utils.h
index 50c178eba2..fb37f35d87 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_utils.h
+++ b/legacy/evas/src/lib/cserve2/evas_cs2_utils.h
@@ -2,12 +2,12 @@
 #ifndef _EVAS_CSERVE2_UTILS_H_
 #define _EVAS_CSERVE2_UTILS_H_
 
-typedef struct _Fash_Glyph      Fash_Glyph;
+typedef struct _Fash_Glyph2      Fash_Glyph2;
 
-Fash_Glyph *fash_gl_new(void (*free_cb)(void *glyph));
-void fash_gl_free(Fash_Glyph *fash);
-void *fash_gl_find(Fash_Glyph *fash, int item);
-void fash_gl_add(Fash_Glyph *fash, int item, void *glyph);
-void fash_gl_del(Fash_Glyph *fash, int item);
+Fash_Glyph2 *fash_gl_new(void (*free_cb)(void *glyph));
+void fash_gl_free(Fash_Glyph2 *fash);
+void *fash_gl_find(Fash_Glyph2 *fash, int item);
+void fash_gl_add(Fash_Glyph2 *fash, int item, void *glyph);
+void fash_gl_del(Fash_Glyph2 *fash, int item);
 
 #endif /* EVAS_CSERVE2_UTILS_H_ */