Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje.h edje_private.h
Log Message:
actually make symbol hiding work!
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- Edje.h 16 Oct 2005 20:36:20 -0000 1.42
+++ Edje.h 27 Dec 2005 17:17:31 -0000 1.43
@@ -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
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- edje_private.h 30 Nov 2005 09:56:15 -0000 1.101
+++ edje_private.h 27 Dec 2005 17:17:31 -0000 1.102
@@ -31,6 +31,34 @@
#include <string.h>
#include <limits.h>
+
+#ifdef EAPI
+#undef EAPI
+#endif
+#ifdef WIN32
+# ifdef BUILDING_DLL
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI __declspec(dllimport)
+# endif
+#else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+# define EAPI __attribute__ ((visibility("default")))
+# else
+# define EAPI
+# endif
+# else
+# define EAPI
+# endif
+#endif
+
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+# pragma GCC visibility push(hidden)
+# endif
+#endif
+
#ifndef ABS
#define ABS(x) ((x) < 0 ? -(x) : (x))
#endif
@@ -756,22 +784,22 @@
unsigned char *msg;
};
-extern Eet_Data_Descriptor *_edje_edd_edje_file;
-extern Eet_Data_Descriptor *_edje_edd_edje_style;
-extern Eet_Data_Descriptor *_edje_edd_edje_style_tag;
-extern Eet_Data_Descriptor *_edje_edd_edje_data;
-extern Eet_Data_Descriptor *_edje_edd_edje_font_directory;
-extern Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry;
-extern Eet_Data_Descriptor *_edje_edd_edje_image_directory;
-extern Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry;
-extern Eet_Data_Descriptor *_edje_edd_edje_program;
-extern Eet_Data_Descriptor *_edje_edd_edje_program_target;
-extern Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory;
-extern Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory_entry;
-extern Eet_Data_Descriptor *_edje_edd_edje_part_collection;
-extern Eet_Data_Descriptor *_edje_edd_edje_part;
-extern Eet_Data_Descriptor *_edje_edd_edje_part_description;
-extern Eet_Data_Descriptor *_edje_edd_edje_part_image_id;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_file;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_style;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_style_tag;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_data;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_font_directory;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_image_directory;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_program;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_program_target;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory;
+EAPI extern Eet_Data_Descriptor
*_edje_edd_edje_part_collection_directory_entry;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_collection;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_description;
+EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_image_id;
extern int _edje_anim_count;
extern Ecore_Animator *_edje_timer;
-------------------------------------------------------
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
