Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_common_soft16.h evas_common.h
Log Message:
fix compilation with a c++ compiler, add EAPI in front of all cache function
declarations
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_common_soft16.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_common_soft16.h 13 May 2008 20:58:15 -0000 1.2
+++ evas_common_soft16.h 24 May 2008 18:26:51 -0000 1.3
@@ -4,6 +4,10 @@
#include "evas_common.h"
#include "evas_private.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef always_inline
#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
# define always_inline __attribute__((always_inline)) inline
@@ -135,5 +139,9 @@
EAPI void *soft16_font_glyph_new(void *data, RGBA_Font_Glyph
*fg);
EAPI void soft16_font_glyph_free(void *ext_dat);
EAPI void soft16_font_glyph_draw(void *data, void *dest, void
*context, RGBA_Font_Glyph *fg, int x, int y);
+
+#ifdef __cplusplus
+}
+#endif
#endif
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- evas_common.h 20 May 2008 20:56:39 -0000 1.98
+++ evas_common.h 24 May 2008 18:26:51 -0000 1.99
@@ -743,7 +743,7 @@
struct _Evas_Cache_Image_Func
{
Image_Entry *(*alloc)(void);
- void (*delete)(Image_Entry *im);
+ void (*dealloc)(Image_Entry *im);
int (*surface_alloc)(Image_Entry *im, int w, int h);
void (*surface_delete)(Image_Entry *im);
@@ -794,7 +794,7 @@
char* (*key)(Image_Entry *im, const char *file, const char
*key, RGBA_Image_Loadopts *lo, int *error);
Engine_Image_Entry* (*alloc)(void);
- void (*delete)(Engine_Image_Entry *eim);
+ void (*dealloc)(Engine_Image_Entry *eim);
int (*constructor)(Engine_Image_Entry *eim, void* data);
void (*destructor)(Engine_Image_Entry *eim);
@@ -1280,48 +1280,48 @@
void evas_stringshare_shutdown(void);
/****/
-Evas_Cache_Image* evas_cache_image_init(const
Evas_Cache_Image_Func *cb);
-void evas_cache_image_shutdown(Evas_Cache_Image
*cache);
-Image_Entry* evas_cache_image_request(Evas_Cache_Image
*cache, const char *file, const char *key, RGBA_Image_Loadopts *lo, int *error);
-void evas_cache_image_drop(Image_Entry *im);
-void evas_cache_image_data_not_needed(Image_Entry
*im);
-int evas_cache_image_flush(Evas_Cache_Image
*cache);
-
-int evas_cache_image_usage_get(Evas_Cache_Image
*cache);
-int evas_cache_image_get(Evas_Cache_Image *cache);
-void evas_cache_image_set(Evas_Cache_Image *cache,
int size);
-
-Image_Entry* evas_cache_image_alone(Image_Entry *im);
-Image_Entry* evas_cache_image_dirty(Image_Entry *im, int x,
int y, int w, int h);
-void evas_cache_image_load_data(Image_Entry *im);
-void evas_cache_image_surface_alloc(Image_Entry
*im, int w, int h);
-Image_Entry* evas_cache_image_copied_data(Evas_Cache_Image
*cache, int w, int h, DATA32 *image_data, int alpha, int cspace);
-Image_Entry* evas_cache_image_data(Evas_Cache_Image *cache,
int w, int h, DATA32 *image_data, int alpha, int cspace);
-void evas_cache_image_colorspace(Image_Entry *im,
int cspace);
-Image_Entry* evas_cache_image_empty(Evas_Cache_Image
*cache);
-Image_Entry* evas_cache_image_size_set(Image_Entry *im, int
w, int h);
-
-Evas_Cache_Engine_Image* evas_cache_engine_image_init(const
Evas_Cache_Engine_Image_Func *cb, Evas_Cache_Image *parent);
-void
evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
-
-void
evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
-int
evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image *cache);
-int
evas_cache_engine_image_get(Evas_Cache_Engine_Image *cache);
-void
evas_cache_engine_image_set(Evas_Cache_Engine_Image *cache, int limit);
+EAPI Evas_Cache_Image* evas_cache_image_init(const
Evas_Cache_Image_Func *cb);
+EAPI void
evas_cache_image_shutdown(Evas_Cache_Image *cache);
+EAPI Image_Entry* evas_cache_image_request(Evas_Cache_Image
*cache, const char *file, const char *key, RGBA_Image_Loadopts *lo, int *error);
+EAPI void evas_cache_image_drop(Image_Entry *im);
+EAPI void
evas_cache_image_data_not_needed(Image_Entry *im);
+EAPI int evas_cache_image_flush(Evas_Cache_Image
*cache);
+
+EAPI int
evas_cache_image_usage_get(Evas_Cache_Image *cache);
+EAPI int evas_cache_image_get(Evas_Cache_Image
*cache);
+EAPI void evas_cache_image_set(Evas_Cache_Image
*cache, int size);
+
+EAPI Image_Entry* evas_cache_image_alone(Image_Entry *im);
+EAPI Image_Entry* evas_cache_image_dirty(Image_Entry *im,
int x, int y, int w, int h);
+EAPI void evas_cache_image_load_data(Image_Entry
*im);
+EAPI void
evas_cache_image_surface_alloc(Image_Entry *im, int w, int h);
+EAPI Image_Entry*
evas_cache_image_copied_data(Evas_Cache_Image *cache, int w, int h, DATA32
*image_data, int alpha, int cspace);
+EAPI Image_Entry* evas_cache_image_data(Evas_Cache_Image
*cache, int w, int h, DATA32 *image_data, int alpha, int cspace);
+EAPI void evas_cache_image_colorspace(Image_Entry
*im, int cspace);
+EAPI Image_Entry* evas_cache_image_empty(Evas_Cache_Image
*cache);
+EAPI Image_Entry* evas_cache_image_size_set(Image_Entry
*im, int w, int h);
+
+EAPI Evas_Cache_Engine_Image* evas_cache_engine_image_init(const
Evas_Cache_Engine_Image_Func *cb, Evas_Cache_Image *parent);
+EAPI void
evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
+
+EAPI void
evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache);
+EAPI int
evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image *cache);
+EAPI int
evas_cache_engine_image_get(Evas_Cache_Engine_Image *cache);
+EAPI void
evas_cache_engine_image_set(Evas_Cache_Engine_Image *cache, int limit);
-Engine_Image_Entry*
evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache, const char
*file, const char *key,
+EAPI Engine_Image_Entry*
evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache, const char
*file, const char *key,
RGBA_Image_Loadopts *lo, void *engine_data, int *error);
-void
evas_cache_engine_parent_not_needed(Engine_Image_Entry *eim);
-Engine_Image_Entry*
evas_cache_engine_image_engine(Evas_Cache_Engine_Image *cache, void
*engine_data);
-void
evas_cache_engine_image_drop(Engine_Image_Entry *eim);
-Engine_Image_Entry*
evas_cache_engine_image_alone(Engine_Image_Entry *eim, void *data);
-Engine_Image_Entry*
evas_cache_engine_image_dirty(Engine_Image_Entry *eim, int x, int y, int w, int
h);
-Engine_Image_Entry*
evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, int w, int
h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
-Engine_Image_Entry*
evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, int w, int h,
DATA32 *image_data, int alpha, int cspace, void *engine_data);
-void
evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void
*engine_data);
-Engine_Image_Entry*
evas_cache_engine_image_size_set(Engine_Image_Entry *eim, int w, int h);
+EAPI void
evas_cache_engine_parent_not_needed(Engine_Image_Entry *eim);
+EAPI Engine_Image_Entry*
evas_cache_engine_image_engine(Evas_Cache_Engine_Image *cache, void
*engine_data);
+EAPI void
evas_cache_engine_image_drop(Engine_Image_Entry *eim);
+EAPI Engine_Image_Entry*
evas_cache_engine_image_alone(Engine_Image_Entry *eim, void *data);
+EAPI Engine_Image_Entry*
evas_cache_engine_image_dirty(Engine_Image_Entry *eim, int x, int y, int w, int
h);
+EAPI Engine_Image_Entry*
evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, int w, int
h, DATA32 *image_data, int alpha, int cspace, void *engine_data);
+EAPI Engine_Image_Entry*
evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, int w, int h,
DATA32 *image_data, int alpha, int cspace, void *engine_data);
+EAPI void
evas_cache_engine_image_colorspace(Engine_Image_Entry *eim, int cspace, void
*engine_data);
+EAPI Engine_Image_Entry*
evas_cache_engine_image_size_set(Engine_Image_Entry *eim, int w, int h);
-void
evas_cache_engine_image_load_data(Engine_Image_Entry *eim);
+EAPI void
evas_cache_engine_image_load_data(Engine_Image_Entry *eim);
/*****************************************************************************/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
