Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h eet_data.c eet_image.c eet_lib.c eet_memfile.c
Log Message:
actually make symbol hiding work!
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- Eet.h 30 Nov 2005 15:36:19 -0000 1.28
+++ Eet.h 27 Dec 2005 17:17:31 -0000 1.29
@@ -13,8 +13,12 @@
# define EAPI __declspec(dllimport)
# endif
#else
-# ifdef GCC_HASCLASSVISIBILITY
-# define EAPI __attribute__ ((visibility("default")))
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+# define EAPI __attribute__ ((visibility("default")))
+# else
+# define EAPI
+# endif
# else
# define EAPI
# endif
@@ -673,7 +677,14 @@
*
*/
EAPI Eet_Data_Descriptor *eet_data_descriptor_new(const char *name, int
size, void *(*func_list_next) (void *l), void *(*func_list_append) (void *l,
void *d), void *(*func_list_data) (void *l), void *(*func_list_free) (void *l),
void (*func_hash_foreach) (void *h, int (*func) (void *h, const char *k, void
*dt, void *fdt), void *fdt), void *(*func_hash_add) (void *h, const char *k,
void *d), void (*func_hash_free) (void *h));
-
+ /*
+ * FIXME:
+ *
+ * moving to this api from the old above. this will break things when the
+ * move happens - but be warned
+ */
+ EAPI Eet_Data_Descriptor
*eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc);
+
/**
* This function frees a data descriptor when it is not needed anymore.
* @param edd The data descriptor to free.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- eet_data.c 30 Nov 2005 15:36:19 -0000 1.33
+++ eet_data.c 27 Dec 2005 17:17:31 -0000 1.34
@@ -39,6 +39,12 @@
*
*/
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+# pragma GCC visibility push(hidden)
+# endif
+#endif
+
/*---*/
typedef struct _Eet_Data_Element Eet_Data_Element;
@@ -712,7 +718,7 @@
/*---*/
-Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor_new(const char *name,
int size,
void *(*func_list_next) (void *l),
@@ -749,7 +755,7 @@
}
/* new replcement */
-Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
{
Eet_Data_Descriptor *edd;
@@ -781,7 +787,7 @@
return edd;
}
-void
+EAPI void
eet_data_descriptor_free(Eet_Data_Descriptor *edd)
{
_eet_descriptor_hash_free(edd);
@@ -790,7 +796,7 @@
free(edd);
}
-void
+EAPI void
eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
const char *name, int type,
int group_type,
@@ -853,7 +859,7 @@
ede->subtype = subtype;
}
-void *
+EAPI void *
eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, char *name)
{
void *data_dec;
@@ -867,7 +873,7 @@
return data_dec;
}
-int
+EAPI int
eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, char *name, void *data,
int compress)
{
void *data_enc;
@@ -1037,7 +1043,7 @@
freelist_str_ref--;
}
-void *
+EAPI void *
eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
void *data_in,
int size_in)
@@ -1126,7 +1132,7 @@
{
char **str, *str2;
- str = (((char *)data) + ede->offset);
+ str = (char **)(((char *)data) + ede->offset);
if (*str)
{
str2 = edd->func.str_alloc(*str);
@@ -1261,7 +1267,7 @@
return data;
}
-void *
+EAPI void *
eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
void *data_in,
int *size_ret)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eet_image.c 4 Nov 2005 03:22:22 -0000 1.4
+++ eet_image.c 27 Dec 2005 17:17:31 -0000 1.5
@@ -1,6 +1,12 @@
#include "Eet.h"
#include "Eet_private.h"
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+# pragma GCC visibility push(hidden)
+# endif
+#endif
+
/*---*/
typedef struct _JPEG_error_mgr *emptr;
@@ -691,7 +697,7 @@
return d;
}
-int
+EAPI int
eet_data_image_write(Eet_File *ef, char *name,
void *data, unsigned int w, unsigned int h, int alpha,
int compress, int quality, int lossy)
@@ -711,7 +717,7 @@
return 0;
}
-void *
+EAPI void *
eet_data_image_read(Eet_File *ef, char *name,
unsigned int *w, unsigned int *h, int *alpha,
int *compress, int *quality, int *lossy)
@@ -727,7 +733,7 @@
return d;
}
-int
+EAPI int
eet_data_image_header_read(Eet_File *ef, char *name,
unsigned int *w, unsigned int *h, int *alpha,
int *compress, int *quality, int *lossy)
@@ -743,7 +749,7 @@
return d;
}
-void *
+EAPI void *
eet_data_image_encode(void *data, int *size_ret, unsigned int w, unsigned int
h, int alpha, int compress, int quality, int lossy)
{
void *d = NULL;
@@ -767,7 +773,7 @@
return d;
}
-int
+EAPI int
eet_data_image_header_decode(void *data, int size, unsigned int *w, unsigned
int *h, int *alpha, int *compress, int *quality, int *lossy)
{
int header[8];
@@ -851,7 +857,7 @@
return 0;
}
-void *
+EAPI void *
eet_data_image_decode(void *data, int size, unsigned int *w, unsigned int *h,
int *alpha, int *compress, int *quality, int *lossy)
{
unsigned int *d = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- eet_lib.c 29 Nov 2005 18:49:30 -0000 1.56
+++ eet_lib.c 27 Dec 2005 17:17:31 -0000 1.57
@@ -5,6 +5,12 @@
#include "Eet.h"
#include "Eet_private.h"
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+# pragma GCC visibility push(hidden)
+# endif
+#endif
+
#ifdef HAVE_REALPATH
#undef HAVE_REALPATH
#endif
@@ -361,13 +367,13 @@
ef->writes_pending = 0;
}
-int
+EAPI int
eet_init(void)
{
return ++eet_initcount;
}
-int
+EAPI int
eet_shutdown(void)
{
if (--eet_initcount == 0)
@@ -379,7 +385,7 @@
return eet_initcount;
}
-void
+EAPI void
eet_cacheburst(int on)
{
if (eet_cacheburst_mode == on) return;
@@ -425,7 +431,7 @@
}
}
-Eet_File *
+EAPI Eet_File *
eet_open(const char *file, Eet_File_Mode mode)
{
Eet_File *ef;
@@ -711,7 +717,7 @@
return ef;
}
-Eet_File_Mode
+EAPI Eet_File_Mode
eet_mode_get(Eet_File *ef)
{
/* check to see its' an eet file pointer */
@@ -721,7 +727,7 @@
return ef->mode;
}
-void
+EAPI void
eet_close(Eet_File *ef)
{
/* check to see its' an eet file pointer */
@@ -781,7 +787,7 @@
free(ef);
}
-void *
+EAPI void *
eet_read(Eet_File *ef, char *name, int *size_ret)
{
void *data = NULL;
@@ -870,7 +876,7 @@
return data;
}
-int
+EAPI int
eet_write(Eet_File *ef, char *name, void *data, int size, int compress)
{
int data_size;
@@ -986,7 +992,7 @@
return data_size;
}
-int
+EAPI int
eet_delete(Eet_File *ef, char *name)
{
int hash;
@@ -1027,7 +1033,7 @@
return exists_already;
}
-char **
+EAPI char **
eet_list(Eet_File *ef, char *glob, int *count_ret)
{
char **list_ret = NULL;
@@ -1084,7 +1090,7 @@
return list_ret;
}
-int
+EAPI int
eet_num_entries(Eet_File *ef)
{
int i, num, ret = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_memfile.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- eet_memfile.c 4 Nov 2005 03:24:50 -0000 1.8
+++ eet_memfile.c 27 Dec 2005 17:17:31 -0000 1.9
@@ -1,6 +1,12 @@
#include "Eet.h"
#include "Eet_private.h"
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+# pragma GCC visibility push(hidden)
+# endif
+#endif
+
FILE *
_eet_memfile_read_open(void *data, size_t size)
{
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
