* EAPI_DEF is actually useless. go back to EAPI
before using the correct way to deal with dllimport / dllexport on Windows * remove some trailing spaces SVN revision: 33949
This commit is contained in:
parent
fad0d39cdc
commit
a3b06c3a70
|
@ -12,7 +12,6 @@
|
|||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
# define EAPI_DEF
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
|
@ -23,7 +22,6 @@
|
|||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# define EAPI_DEF EAPI
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -878,7 +878,7 @@ _eet_str_free(const char *str)
|
|||
|
||||
/*---*/
|
||||
|
||||
EAPI_DEF Eet_Data_Descriptor *
|
||||
EAPI Eet_Data_Descriptor *
|
||||
eet_data_descriptor_new(const char *name,
|
||||
int size,
|
||||
void *(*func_list_next) (void *l),
|
||||
|
@ -914,7 +914,7 @@ eet_data_descriptor_new(const char *name,
|
|||
}
|
||||
|
||||
/* new replcement */
|
||||
EAPI_DEF Eet_Data_Descriptor *
|
||||
EAPI Eet_Data_Descriptor *
|
||||
eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
|
||||
{
|
||||
Eet_Data_Descriptor *edd;
|
||||
|
@ -949,7 +949,7 @@ eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
|
|||
return edd;
|
||||
}
|
||||
|
||||
EAPI_DEF Eet_Data_Descriptor *
|
||||
EAPI Eet_Data_Descriptor *
|
||||
eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc)
|
||||
{
|
||||
Eet_Data_Descriptor *edd;
|
||||
|
@ -988,7 +988,7 @@ eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc)
|
|||
return edd;
|
||||
}
|
||||
|
||||
EAPI_DEF void
|
||||
EAPI void
|
||||
eet_data_descriptor_free(Eet_Data_Descriptor *edd)
|
||||
{
|
||||
_eet_descriptor_hash_free(edd);
|
||||
|
@ -996,7 +996,7 @@ eet_data_descriptor_free(Eet_Data_Descriptor *edd)
|
|||
free(edd);
|
||||
}
|
||||
|
||||
EAPI_DEF void
|
||||
EAPI void
|
||||
eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
|
||||
const char *name, int type,
|
||||
int group_type,
|
||||
|
@ -1023,7 +1023,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
|
|||
ede->subtype = subtype;
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
|
||||
{
|
||||
const Eet_Dictionary *ed = NULL;
|
||||
|
@ -1049,7 +1049,7 @@ eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
|
|||
return data_dec;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const void *data, int compress)
|
||||
{
|
||||
Eet_Dictionary *ed;
|
||||
|
@ -2472,7 +2472,7 @@ error:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_data_text_dump(const void *data_in,
|
||||
int size_in,
|
||||
void (*dumpfunc) (void *data, const char *str),
|
||||
|
@ -2484,7 +2484,7 @@ eet_data_text_dump(const void *data_in,
|
|||
return 0;
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_data_text_undump(const char *text,
|
||||
int textlen,
|
||||
int *size_ret)
|
||||
|
@ -2492,7 +2492,7 @@ eet_data_text_undump(const char *text,
|
|||
return _eet_data_dump_parse(NULL, size_ret, text, textlen);
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
|
||||
const void *data_in,
|
||||
int size_in)
|
||||
|
@ -2632,7 +2632,7 @@ _eet_data_descriptor_encode(Eet_Dictionary *ed,
|
|||
return cdata;
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
|
||||
const void *data_in,
|
||||
int *size_ret)
|
||||
|
|
|
@ -703,7 +703,7 @@ eet_data_image_jpeg_alpha_convert(int *size, const void *data, unsigned int w, u
|
|||
return d;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_data_image_write(Eet_File *ef, const char *name,
|
||||
const void *data, unsigned int w, unsigned int h, int alpha,
|
||||
int compress, int quality, int lossy)
|
||||
|
@ -723,7 +723,7 @@ eet_data_image_write(Eet_File *ef, const char *name,
|
|||
return 0;
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_data_image_read(Eet_File *ef, const char *name,
|
||||
unsigned int *w, unsigned int *h, int *alpha,
|
||||
int *compress, int *quality, int *lossy)
|
||||
|
@ -750,7 +750,7 @@ eet_data_image_read(Eet_File *ef, const char *name,
|
|||
return d;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_data_image_header_read(Eet_File *ef, const char *name,
|
||||
unsigned int *w, unsigned int *h, int *alpha,
|
||||
int *compress, int *quality, int *lossy)
|
||||
|
@ -775,7 +775,7 @@ eet_data_image_header_read(Eet_File *ef, const char *name,
|
|||
return d;
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_data_image_encode(const void *data, int *size_ret, unsigned int w, unsigned int h, int alpha, int compress, int quality, int lossy)
|
||||
{
|
||||
void *d = NULL;
|
||||
|
@ -799,7 +799,7 @@ eet_data_image_encode(const void *data, int *size_ret, unsigned int w, unsigned
|
|||
return d;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_data_image_header_decode(const void *data, int size, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy)
|
||||
{
|
||||
int header[8];
|
||||
|
@ -883,7 +883,7 @@ eet_data_image_header_decode(const void *data, int size, unsigned int *w, unsign
|
|||
return 0;
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_data_image_decode(const void *data, int size, unsigned int *w, unsigned int *h, int *alpha, int *compress, int *quality, int *lossy)
|
||||
{
|
||||
unsigned int *d = NULL;
|
||||
|
|
|
@ -599,13 +599,13 @@ write_error:
|
|||
return EET_ERROR_WRITE_ERROR;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_init(void)
|
||||
{
|
||||
return ++eet_initcount;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_shutdown(void)
|
||||
{
|
||||
if (--eet_initcount == 0)
|
||||
|
@ -617,7 +617,7 @@ eet_shutdown(void)
|
|||
return eet_initcount;
|
||||
}
|
||||
|
||||
EAPI_DEF void
|
||||
EAPI void
|
||||
eet_clearcache(void)
|
||||
{
|
||||
int num = 0;
|
||||
|
@ -1043,7 +1043,7 @@ eet_internal_read(Eet_File *ef)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
EAPI_DEF Eet_File *
|
||||
EAPI Eet_File *
|
||||
eet_memopen_read(const void *data, size_t size)
|
||||
{
|
||||
Eet_File *ef;
|
||||
|
@ -1070,7 +1070,7 @@ eet_memopen_read(const void *data, size_t size)
|
|||
return eet_internal_read(ef);
|
||||
}
|
||||
|
||||
EAPI_DEF Eet_File *
|
||||
EAPI Eet_File *
|
||||
eet_open(const char *file, Eet_File_Mode mode)
|
||||
{
|
||||
FILE *fp;
|
||||
|
@ -1235,7 +1235,7 @@ eet_open(const char *file, Eet_File_Mode mode)
|
|||
return ef;
|
||||
}
|
||||
|
||||
EAPI_DEF Eet_File_Mode
|
||||
EAPI Eet_File_Mode
|
||||
eet_mode_get(Eet_File *ef)
|
||||
{
|
||||
/* check to see its' an eet file pointer */
|
||||
|
@ -1245,7 +1245,7 @@ eet_mode_get(Eet_File *ef)
|
|||
return ef->mode;
|
||||
}
|
||||
|
||||
EAPI_DEF Eet_Error
|
||||
EAPI Eet_Error
|
||||
eet_close(Eet_File *ef)
|
||||
{
|
||||
Eet_Error err;
|
||||
|
@ -1318,7 +1318,7 @@ eet_close(Eet_File *ef)
|
|||
return err;
|
||||
}
|
||||
|
||||
EAPI_DEF void *
|
||||
EAPI void *
|
||||
eet_read(Eet_File *ef, const char *name, int *size_ret)
|
||||
{
|
||||
void *data = NULL;
|
||||
|
@ -1417,7 +1417,7 @@ eet_read(Eet_File *ef, const char *name, int *size_ret)
|
|||
return data;
|
||||
}
|
||||
|
||||
EAPI_DEF const void *
|
||||
EAPI const void *
|
||||
eet_read_direct(Eet_File *ef, const char *name, int *size_ret)
|
||||
{
|
||||
const void *data = NULL;
|
||||
|
@ -1462,7 +1462,7 @@ eet_read_direct(Eet_File *ef, const char *name, int *size_ret)
|
|||
return data;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_write(Eet_File *ef, const char *name, const void *data, int size, int compress)
|
||||
{
|
||||
Eet_File_Node *efn;
|
||||
|
@ -1583,7 +1583,7 @@ eet_write(Eet_File *ef, const char *name, const void *data, int size, int compre
|
|||
return data_size;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_delete(Eet_File *ef, const char *name)
|
||||
{
|
||||
Eet_File_Node *efn;
|
||||
|
@ -1637,7 +1637,7 @@ eet_delete(Eet_File *ef, const char *name)
|
|||
return exists_already;
|
||||
}
|
||||
|
||||
EAPI_DEF Eet_Dictionary*
|
||||
EAPI Eet_Dictionary*
|
||||
eet_dictionary_get(Eet_File *ef)
|
||||
{
|
||||
if (eet_check_pointer(ef)) return NULL;
|
||||
|
@ -1646,7 +1646,7 @@ eet_dictionary_get(Eet_File *ef)
|
|||
}
|
||||
|
||||
|
||||
EAPI_DEF char **
|
||||
EAPI char **
|
||||
eet_list(Eet_File *ef, const char *glob, int *count_ret)
|
||||
{
|
||||
Eet_File_Node *efn;
|
||||
|
@ -1714,7 +1714,7 @@ eet_list(Eet_File *ef, const char *glob, int *count_ret)
|
|||
return list_ret;
|
||||
}
|
||||
|
||||
EAPI_DEF int
|
||||
EAPI int
|
||||
eet_num_entries(Eet_File *ef)
|
||||
{
|
||||
int i, num, ret = 0;
|
||||
|
|
Loading…
Reference in New Issue