* eina/src/include/eina_array.h,

* eina/src/include/eina_f16p16.h,
	* eina/src/include/eina_accessor.h,
	* eina/src/include/eina_list.h,
	* eina/src/include/eina_iterator.h,
	* eina/src/lib/eina_rectangle.c,
	* eina/src/lib/eina_list.c,
	* eina/src/lib/eina_array.c,
	* eina/src/lib/eina_hash.c,
	* eina/src/lib/eina_module.c,
	* eina/src/lib/eina_stringshare.c,
	* eina/src/lib/eina_benchmark.c: Fix for windows compilation.



SVN revision: 38663
This commit is contained in:
Cedric BAIL 2009-01-20 15:56:48 +00:00
parent 8a380803a7
commit 0dda30daf6
12 changed files with 60 additions and 18 deletions

View File

@ -47,7 +47,7 @@ struct _Eina_Accessor
Eina_Accessor_Free_Callback free EINA_ARG_NONNULL(1);
#define EINA_MAGIC_ACCESSOR 0x98761232
EINA_MAGIC;
EINA_MAGIC
};
#define FUNC_ACCESSOR_GET_AT(Function) ((Eina_Accessor_Get_At_Callback)Function)

View File

@ -70,7 +70,7 @@ struct _Eina_Array
unsigned int count; /**< Number of activ slot in the vector */
unsigned int step; /**< How much must we grow the vector when it is full */
EINA_MAGIC;
EINA_MAGIC
};
EAPI int eina_array_init (void);

View File

@ -19,7 +19,11 @@
#ifndef EINA_F16P16_H_
#define EINA_F16P16_H_
#include <stdint.h>
#ifdef _MSC_VER
# include <Evil.h>
#else
# include <stdint.h>
#endif
/**
* To be documented

View File

@ -47,7 +47,7 @@ struct _Eina_Iterator
Eina_Iterator_Free_Callback free EINA_ARG_NONNULL(1);
#define EINA_MAGIC_ITERATOR 0x98761233
EINA_MAGIC;
EINA_MAGIC
};

View File

@ -65,14 +65,14 @@ struct _Eina_List /** A linked list node */
Eina_List *prev; /**< Previous member in the list */
struct _Eina_List_Accounting *accounting; /**< Private list accounting info - don't touch */
EINA_MAGIC;
EINA_MAGIC
};
struct _Eina_List_Accounting
{
Eina_List *last;
unsigned int count;
EINA_MAGIC;
EINA_MAGIC
};

View File

@ -76,7 +76,7 @@ struct _Eina_Iterator_Array
const Eina_Array *array;
unsigned int index;
EINA_MAGIC;
EINA_MAGIC
};
typedef struct _Eina_Accessor_Array Eina_Accessor_Array;
@ -84,7 +84,7 @@ struct _Eina_Accessor_Array
{
Eina_Accessor accessor;
const Eina_Array *array;
EINA_MAGIC;
EINA_MAGIC
};
static int _eina_array_init_count = 0;

View File

@ -49,6 +49,23 @@ extern "C"
void *alloca (size_t);
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#include "eina_benchmark.h"
#include "eina_inlist.h"
#include "eina_counter.h"

View File

@ -23,7 +23,11 @@
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#ifdef _MSC_VER
# include <Evil.h>
#else
# include <stdint.h>
#endif
#include "eina_hash.h"
#include "eina_rbtree.h"
@ -75,7 +79,7 @@ struct _Eina_Hash
int population;
EINA_MAGIC;
EINA_MAGIC
};
struct _Eina_Hash_Head
@ -117,7 +121,7 @@ struct _Eina_Iterator_Hash
int index;
EINA_MAGIC;
EINA_MAGIC
};
struct _Eina_Hash_Each

View File

@ -123,7 +123,7 @@ struct _Eina_Iterator_List
const Eina_List *head;
const Eina_List *current;
EINA_MAGIC;
EINA_MAGIC
};
struct _Eina_Accessor_List
@ -135,7 +135,7 @@ struct _Eina_Accessor_List
unsigned int index;
EINA_MAGIC;
EINA_MAGIC
};
static int _eina_list_init_count = 0;

View File

@ -46,6 +46,23 @@ extern "C"
void *alloca (size_t);
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif
#include <dlfcn.h>
#ifdef HAVE_EVIL

View File

@ -49,14 +49,14 @@ struct _Eina_Rectangle_Pool
unsigned int references;
int w;
int h;
EINA_MAGIC;
EINA_MAGIC
};
struct _Eina_Rectangle_Alloc
{
EINA_INLIST;
Eina_Rectangle_Pool *pool;
EINA_MAGIC;
EINA_MAGIC
};
#define EINA_MAGIC_CHECK_RECTANGLE_POOL(d) \

View File

@ -113,14 +113,14 @@ struct _Eina_Stringshare
{
Eina_Stringshare_Head *buckets[EINA_STRINGSHARE_BUCKETS];
EINA_MAGIC;
EINA_MAGIC
};
struct _Eina_Stringshare_Node
{
Eina_Stringshare_Node *next;
EINA_MAGIC;
EINA_MAGIC
unsigned short length;
unsigned short references;
@ -130,7 +130,7 @@ struct _Eina_Stringshare_Node
struct _Eina_Stringshare_Head
{
EINA_RBTREE;
EINA_MAGIC;
EINA_MAGIC
int hash;