Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/include
Modified Files:
eina_private.h
Log Message:
Cleanup.
===================================================================
RCS file: /cvs/e/e17/proto/eina/src/include/eina_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eina_private.h 30 Jul 2008 13:35:49 -0000 1.2
+++ eina_private.h 31 Jul 2008 15:08:47 -0000 1.3
@@ -44,24 +44,6 @@
#define READBUFSIZ 65536
-#define EINA_MAGIC_NONE 0x1234fedc
-#define EINA_MAGIC_EXE 0xf7e812f5
-#define EINA_MAGIC_TIMER 0xf7d713f4
-#define EINA_MAGIC_IDLER 0xf7c614f3
-#define EINA_MAGIC_IDLE_ENTERER 0xf7b515f2
-#define EINA_MAGIC_IDLE_EXITER 0xf7601afd
-#define EINA_MAGIC_FD_HANDLER 0xf7a416f1
-#define EINA_MAGIC_EVENT_HANDLER 0xf79317f0
-#define EINA_MAGIC_EVENT_FILTER 0xf78218ff
-#define EINA_MAGIC_EVENT 0xf77119fe
-#define EINA_MAGIC_ANIMATOR 0xf7643ea5
-
-#define EINA_MAGIC Eina_Magic __magic
-
-#define EINA_MAGIC_SET(d, m) (d)->__magic = (m)
-#define EINA_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m)))
-#define EINA_MAGIC_FAIL(d, m, fn) _eina_magic_fail((d), (d) ? (d)->__magic :
0, (m), (fn));
-
/* undef the following, we want out version */
#undef FREE
#define FREE(ptr) free(ptr); ptr = NULL;
@@ -91,36 +73,6 @@
return; \
}
-typedef unsigned int Eina_Magic;
-
-typedef struct _Eina_List2 Eina_List2;
-typedef struct _Eina_List2_Data Eina_List2_Data;
-
-struct _Eina_List2
-{
- Eina_List2 *next, *prev;
- Eina_List2 *last;
-};
-
-struct _Eina_List2_Data
-{
- Eina_List2 __list_data;
- void *data;
-};
-
-#ifndef EINA_H
-
-#endif
-
-EAPI void _eina_magic_fail(void *d, Eina_Magic m, Eina_Magic req_m,
const char *fname);
-
-EAPI void *_eina_list2_append (void *in_list, void *in_item);
-EAPI void *_eina_list2_prepend (void *in_list, void *in_item);
-EAPI void *_eina_list2_append_relative (void *in_list, void *in_item,
void *in_relative);
-EAPI void *_eina_list2_prepend_relative (void *in_list, void *in_item,
void *in_relative);
-EAPI void *_eina_list2_remove (void *in_list, void *in_item);
-EAPI void *_eina_list2_find (void *in_list, void *in_item);
-
void _eina_fps_debug_init(void);
void _eina_fps_debug_shutdown(void);
void _eina_fps_debug_runtime_add(double t);
@@ -129,18 +81,17 @@
extern int _eina_fps_debug;
-
/* old code finish */
/* mp */
typedef struct _Eina_Mempool_Backend
{
- void *(*init)(void *buffer, unsigned int size, const char *options,
va_list args);
- void (*free)(void *data, void *element);
- void *(*alloc)(void *data, unsigned int size);
- void *(*realloc)(void *data, void *element, unsigned int size);
- void (*garbage_collect)(void);
- void (*statistics)(void);
- void (*shutdown)(void *data);
+ void *(*init)(const char *context, const char *options, va_list args);
+ void (*free)(void *data, void *element);
+ void *(*alloc)(void *data, unsigned int size);
+ void *(*realloc)(void *data, void *element, unsigned int size);
+ void (*garbage_collect)(void);
+ void (*statistics)(void);
+ void (*shutdown)(void *data);
} Eina_Mempool_Backend;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
