Remove ecore_strings and switch to eina_stringshare.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@36675 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ecore.pc.in b/ecore.pc.in
index cd68143..0de87ff 100644 (file)
--- a/ecore.pc.in
+++ b/ecore.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: ecore
 Description: Ecore event abstraction library
-Requires:
+Requires: eina-0
 Version: @VERSION@
 Libs: -L${libdir} -lecore
 Libs.private: -lm

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index bc2c0dd..bf59b69 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EINA_CFLAGS@ \
 @EET_CFLAGS@
 
 bin_PROGRAMS = $(ECORE_CONFIG_PROG)

diff --git a/src/lib/ecore/Ecore_Data.h b/src/lib/ecore/Ecore_Data.h
index c159172..0598e9d 100644 (file)
--- a/src/lib/ecore/Ecore_Data.h
+++ b/src/lib/ecore/Ecore_Data.h
@@ -30,6 +30,8 @@
 /* we need this for size_t */
 #include <stddef.h>
 
+#include <Eina.h>
+
 /**
  * @file Ecore_Data.h
  * @brief Contains threading, list, hash, debugging and tree functions.
@@ -387,20 +389,13 @@ extern "C" {
    
    EAPI void *ecore_sheap_item(Ecore_Sheap *heap, int i);
    
-   
-   typedef struct _ecore_string Ecore_String;
-   struct _ecore_string {
-      char *string;
-      int references;
-   };
-   
-   EAPI int ecore_string_init(void);
-   EAPI void ecore_string_shutdown(void);
-   EAPI const char *ecore_string_instance(const char *string);
-   EAPI void ecore_string_release(const char *string);
-   EAPI void ecore_string_hash_dump_graph(void);
-   EAPI void ecore_string_hash_dump_stats(void);
-   
+  #define ecore_string_init eina_stringshare_init
+  #define ecore_string_shutdown eina_stringshare_shutdown
+  #define ecore_string_instance eina_stringshare_add
+  #define ecore_string_release eina_stringshare_del
+
+  #define ecore_string_hash_dump_graph (void)0
+  #define ecore_string_hash_dump_stats (void)0
    
    typedef struct _Ecore_Tree_Node Ecore_Tree_Node;
 # define ECORE_TREE_NODE(object) ((Ecore_Tree_Node *)object)

diff --git a/src/lib/ecore/Makefile.am b/src/lib/ecore/Makefile.am
index 9877977..10ece20 100644 (file)
--- a/src/lib/ecore/Makefile.am
+++ b/src/lib/ecore/Makefile.am
@@ -26,7 +26,6 @@ ecore_sheap.c \
 ecore_signal.c \
 ecore_str.c \
 ecore_strbuf.c \
-ecore_strings.c \
 ecore_time.c \
 ecore_timer.c \
 ecore_tree.c \