kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eet: Rename EAPI macro to EET_API in Eet library 

Patch from a series of patches to rename EAPI symbols to specific
library DSOs.

EAPI was designed to be able to pass
```__attribute__ ((visibility ("default")))``` for symbols with
GCC, which would mean that even if -fvisibility=hidden was used
when compiling the library, the needed symbols would get exported.

MSVC __almost__ works like GCC (or mingw) in which you can
declare everything as export and it will just work (slower, but
it will work). But there's a caveat: global variables will not
work the same way for MSVC, but works for mingw and GCC.

For global variables (as opposed to functions), MSVC requires
correct DSO visibility for MSVC: instead of declaring a symbol as
export for everything, you need to declare it as import when
importing from another DSO and export when defining it locally.

With current EAPI definitions, we get the following example
working in mingw and MSVC (observe it doesn't define any global
variables as exported symbols).

Example 1:
dll1:
```
EAPI void foo(void);

EAPI void bar()
{
  foo();
}
```
dll2:
```
EAPI void foo()
{
  printf ("foo\n");
}
```

This works fine with API defined as __declspec(dllexport) in both
cases and for gcc defining as
```__atttribute__((visibility("default")))```.

However, the following:
Example 2:

dll1:

```
EAPI extern int foo;
EAPI void foobar(void);

EAPI void bar()
{
  foo = 5;
  foobar();
}
```

dll2:

```
EAPI int foo = 0;
EAPI void foobar()
{
  printf ("foo %d\n", foo);
}
```

This will work on mingw but will not work for MSVC. And that's why
EAPI is the only solution that worked for MSVC.

Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com>
Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev>
Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com>
This commit is contained in:
Felipe Magno de Almeida 2020-10-25 10:55:40 -03:00
parent c0e42a3bf4
commit 7c933562d9
10 changed files with 252 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
src/lib/eet/Eet.h
View File

File diff suppressed because it is too large Load Diff

34
src/lib/eet/eet_api.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef _EFL_EET_API_H
#define _EFL_EET_API_H
#ifdef EET_API
#error EET_API should not be already defined
#endif
#ifdef _WIN32
# ifndef EET_STATIC
# ifdef EET_BUILD
# define EET_API __declspec(dllexport)
# else
# define EET_API __declspec(dllimport)
# endif
# else
# define EET_API
# endif
# define EET_API_WEAK
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EET_API __attribute__ ((visibility("default")))
# define EET_API_WEAK __attribute__ ((weak))
# else
# define EET_API
# define EET_API_WEAK
# endif
# else
# define EET_API
# define EET_API_WEAK
# endif
#endif
#endif

8
src/lib/eet/eet_cipher.c
View File

@ -73,7 +73,7 @@ struct _Eet_Key
#endif /* ifdef HAVE_SIGNATURE */
};
EAPI Eet_Key *
EET_API Eet_Key *
eet_identity_open(const char *certificate_file,
const char *private_key_file,
Eet_Key_Password_Callback cb)
@ -240,7 +240,7 @@ on_error:
return NULL;
}
EAPI void
EET_API void
eet_identity_close(Eet_Key *key)
{
if (!emile_cipher_init()) return ;
@ -262,7 +262,7 @@ eet_identity_close(Eet_Key *key)
#endif /* ifdef HAVE_SIGNATURE */
}
EAPI void
EET_API void
eet_identity_print(Eet_Key *key,
FILE *out)
{
@ -829,7 +829,7 @@ eet_identity_check(const void *data_base,
#endif /* ifdef HAVE_SIGNATURE */
}
EAPI void
EET_API void
eet_identity_certificate_print(const unsigned char *certificate,
int der_length,
FILE *out)

12
src/lib/eet/eet_connection.c
View File

@ -27,7 +27,7 @@ struct _Eet_Connection
void *buffer;
};
EAPI Eet_Connection *
EET_API Eet_Connection *
eet_connection_new(Eet_Read_Cb *eet_read_cb,
Eet_Write_Cb *eet_write_cb,
const void *user_data)
@ -44,7 +44,7 @@ eet_connection_new(Eet_Read_Cb *eet_read_cb,
return conn;
}
EAPI int
EET_API int
eet_connection_received(Eet_Connection *conn,
const void *data,
size_t size)
@ -146,14 +146,14 @@ _eet_connection_raw_send(Eet_Connection *conn,
return EINA_TRUE;
}
EAPI Eina_Bool
EET_API Eina_Bool
eet_connection_empty(Eet_Connection *conn)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_TRUE);
return conn->size ? EINA_FALSE : EINA_TRUE;
}
EAPI Eina_Bool
EET_API Eina_Bool
eet_connection_send(Eet_Connection *conn,
Eet_Data_Descriptor *edd,
const void *data_in,
@ -175,7 +175,7 @@ eet_connection_send(Eet_Connection *conn,
return ret;
}
EAPI Eina_Bool
EET_API Eina_Bool
eet_connection_node_send(Eet_Connection *conn,
Eet_Node *node,
const char *cipher_key)
@ -194,7 +194,7 @@ eet_connection_node_send(Eet_Connection *conn,
return ret;
}
EAPI void *
EET_API void *
eet_connection_close(Eet_Connection *conn,
Eina_Bool *on_going)
{

66
src/lib/eet/eet_data.c
View File

@ -1918,7 +1918,7 @@ _eet_eina_hash_free(void *hash)
}
/*---*/
EAPI Eina_Bool
EET_API Eina_Bool
eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
/* When we change the structure content in the future, we need to handle old structure type too */
unsigned int eddc_size,
@ -1953,7 +1953,7 @@ eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
return EINA_TRUE;
}
EAPI Eina_Bool
EET_API Eina_Bool
eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
/* When we change the structure content in the future, we need to handle old structure type too */
unsigned int eddc_size,
@ -2033,7 +2033,7 @@ _eet_data_descriptor_new(const Eet_Data_Descriptor_Class *eddc,
return edd;
}
EAPI Eet_Data_Descriptor *
EET_API Eet_Data_Descriptor *
eet_data_descriptor_new(const char *name,
int size,
Eet_Descriptor_List_Next_Callback func_list_next,
@ -2066,31 +2066,31 @@ eet_data_descriptor_new(const char *name,
return _eet_data_descriptor_new(&eddc, 0);
}
EAPI Eet_Data_Descriptor *
EET_API Eet_Data_Descriptor *
eet_data_descriptor2_new(const Eet_Data_Descriptor_Class *eddc)
{
return _eet_data_descriptor_new(eddc, 1);
}
EAPI Eet_Data_Descriptor *
EET_API Eet_Data_Descriptor *
eet_data_descriptor3_new(const Eet_Data_Descriptor_Class *eddc)
{
return _eet_data_descriptor_new(eddc, 2);
}
EAPI Eet_Data_Descriptor *
EET_API Eet_Data_Descriptor *
eet_data_descriptor_stream_new(const Eet_Data_Descriptor_Class *eddc)
{
return _eet_data_descriptor_new(eddc, 1);
}
EAPI Eet_Data_Descriptor *
EET_API Eet_Data_Descriptor *
eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc)
{
return _eet_data_descriptor_new(eddc, 2);
}
EAPI const char *
EET_API const char *
eet_data_descriptor_name_get(const Eet_Data_Descriptor *edd)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(edd, NULL);
@ -2098,7 +2098,7 @@ eet_data_descriptor_name_get(const Eet_Data_Descriptor *edd)
}
EAPI void
EET_API void
eet_data_descriptor_free(Eet_Data_Descriptor *edd)
{
if (!edd)
@ -2119,7 +2119,7 @@ eet_data_descriptor_free(Eet_Data_Descriptor *edd)
free(edd);
}
EAPI void
EET_API void
eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
const char *name,
int type,
@ -2256,7 +2256,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
ede->subtype = subtype;
}
EAPI void *
EET_API void *
eet_data_read_cipher(Eet_File *ef,
Eet_Data_Descriptor *edd,
const char *name,
@ -2295,7 +2295,7 @@ eet_data_read_cipher(Eet_File *ef,
return data_dec;
}
EAPI void *
EET_API void *
eet_data_read_cipher_buffer(Eet_File *ef,
Eet_Data_Descriptor *edd,
const char *name,
@ -2336,7 +2336,7 @@ eet_data_read_cipher_buffer(Eet_File *ef,
return data_dec;
}
EAPI Eet_Node *
EET_API Eet_Node *
eet_data_node_read_cipher(Eet_File *ef,
const char *name,
const char *cipher_key)
@ -2373,7 +2373,7 @@ eet_data_node_read_cipher(Eet_File *ef,
return result;
}
EAPI void *
EET_API void *
eet_data_read(Eet_File *ef,
Eet_Data_Descriptor *edd,
const char *name)
@ -2381,7 +2381,7 @@ eet_data_read(Eet_File *ef,
return eet_data_read_cipher(ef, edd, name, NULL);
}
EAPI int
EET_API int
eet_data_write_cipher(Eet_File *ef,
Eet_Data_Descriptor *edd,
const char *name,
@ -2410,7 +2410,7 @@ eet_data_write_cipher(Eet_File *ef,
return val;
}
EAPI int
EET_API int
eet_data_write(Eet_File *ef,
Eet_Data_Descriptor *edd,
const char *name,
@ -4812,7 +4812,7 @@ eet_data_put_hash(Eet_Dictionary *ed,
edd->func.hash_foreach(l, eet_data_descriptor_encode_hash_cb, &fdata);
}
EAPI int
EET_API int
eet_data_dump_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -4855,7 +4855,7 @@ eet_data_dump_cipher(Eet_File *ef,
return result ? 1 : 0;
}
EAPI int
EET_API int
eet_data_dump(Eet_File *ef,
const char *name,
Eet_Dump_Callback dumpfunc,
@ -4864,7 +4864,7 @@ eet_data_dump(Eet_File *ef,
return eet_data_dump_cipher(ef, name, NULL, dumpfunc, dumpdata);
}
EAPI int
EET_API int
eet_data_text_dump_cipher(const void *data_in,
const char *cipher_key,
int size_in,
@ -4909,7 +4909,7 @@ eet_data_text_dump_cipher(const void *data_in,
return result ? 1 : 0;
}
EAPI int
EET_API int
eet_data_text_dump(const void *data_in,
int size_in,
Eet_Dump_Callback dumpfunc,
@ -4918,7 +4918,7 @@ eet_data_text_dump(const void *data_in,
return eet_data_text_dump_cipher(data_in, NULL, size_in, dumpfunc, dumpdata);
}
EAPI void *
EET_API void *
eet_data_text_undump_cipher(const char *text,
const char *cipher_key,
int textlen,
@ -4951,7 +4951,7 @@ eet_data_text_undump_cipher(const char *text,
return ret;
}
EAPI void *
EET_API void *
eet_data_text_undump(const char *text,
int textlen,
int *size_ret)
@ -4959,7 +4959,7 @@ eet_data_text_undump(const char *text,
return eet_data_text_undump_cipher(text, NULL, textlen, size_ret);
}
EAPI int
EET_API int
eet_data_undump_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -4985,7 +4985,7 @@ eet_data_undump_cipher(Eet_File *ef,
return val;
}
EAPI int
EET_API int
eet_data_undump(Eet_File *ef,
const char *name,
const char *text,
@ -4995,7 +4995,7 @@ eet_data_undump(Eet_File *ef,
return eet_data_undump_cipher(ef, name, NULL, text, textlen, comp);
}
EAPI void *
EET_API void *
eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
const void *data_in,
const char *cipher_key,
@ -5033,7 +5033,7 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
return ret;
}
EAPI void *
EET_API void *
eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
const void *data_in,
int size_in)
@ -5041,7 +5041,7 @@ eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
return eet_data_descriptor_decode_cipher(edd, data_in, NULL, size_in);
}
EAPI Eet_Node *
EET_API Eet_Node *
eet_data_node_decode_cipher(const void *data_in,
const char *cipher_key,
int size_in)
@ -5138,7 +5138,7 @@ _eet_data_descriptor_encode(Eet_Dictionary *ed,
return cdata;
}
EAPI int
EET_API int
eet_data_node_write_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -5163,7 +5163,7 @@ eet_data_node_write_cipher(Eet_File *ef,
return val;
}
EAPI void *
EET_API void *
eet_data_node_encode_cipher(Eet_Node *node,
const char *cipher_key,
int *size_ret)
@ -5200,7 +5200,7 @@ eet_data_node_encode_cipher(Eet_Node *node,
return ret;
}
EAPI void *
EET_API void *
eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
const void *data_in,
const char *cipher_key,
@ -5241,7 +5241,7 @@ eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
return ret;
}
EAPI void *
EET_API void *
eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
const void *data_in,
int *size_ret)
@ -5249,7 +5249,7 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
return eet_data_descriptor_encode_cipher(edd, data_in, NULL, size_ret);
}
EAPI void *
EET_API void *
eet_data_xattr_cipher_get(const char *filename,
const char *attribute,
Eet_Data_Descriptor *edd,
@ -5270,7 +5270,7 @@ eet_data_xattr_cipher_get(const char *filename,
return ret;
}
EAPI Eina_Bool
EET_API Eina_Bool
eet_data_xattr_cipher_set(const char *filename,
const char *attribute,
Eet_Data_Descriptor *edd,

4
src/lib/eet/eet_dictionary.c
View File

@ -186,7 +186,7 @@ eet_dictionary_string_get_size(const Eet_Dictionary *ed,
return length;
}
EAPI int
EET_API int
eet_dictionary_count(const Eet_Dictionary *ed)
{
int cnt;
@ -489,7 +489,7 @@ eet_dictionary_string_get_fp(const Eet_Dictionary *ed,
return ret;
}
EAPI int
EET_API int
eet_dictionary_string_check(Eet_Dictionary *ed,
const char *string)
{

38
src/lib/eet/eet_image.c
View File

@ -1318,7 +1318,7 @@ eet_data_image_jpeg_alpha_convert(int *size,
return d;
}
EAPI int
EET_API int
eet_data_image_write_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -1346,7 +1346,7 @@ eet_data_image_write_cipher(Eet_File *ef,
return 0;
}
EAPI int
EET_API int
eet_data_image_write(Eet_File *ef,
const char *name,
const void *data,
@ -1369,7 +1369,7 @@ eet_data_image_write(Eet_File *ef,
lossy);
}
EAPI void *
EET_API void *
eet_data_image_read_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -1404,7 +1404,7 @@ eet_data_image_read_cipher(Eet_File *ef,
return d;
}
EAPI void *
EET_API void *
eet_data_image_read(Eet_File *ef,
const char *name,
unsigned int *w,
@ -1418,7 +1418,7 @@ eet_data_image_read(Eet_File *ef,
comp, quality, lossy);
}
EAPI int
EET_API int
eet_data_image_read_to_cspace_surface_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -1460,7 +1460,7 @@ eet_data_image_read_to_cspace_surface_cipher(Eet_File *ef,
return res;
}
EAPI int
EET_API int
eet_data_image_read_to_surface_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -1481,7 +1481,7 @@ eet_data_image_read_to_surface_cipher(Eet_File *ef,
alpha, comp, quality, lossy);
}
EAPI int
EET_API int
eet_data_image_read_to_surface(Eet_File *ef,
const char *name,
unsigned int src_x,
@ -1502,7 +1502,7 @@ eet_data_image_read_to_surface(Eet_File *ef,
lossy);
}
EAPI int
EET_API int
eet_data_image_header_read_cipher(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -1537,7 +1537,7 @@ eet_data_image_header_read_cipher(Eet_File *ef,
return d;
}
EAPI int
EET_API int
eet_data_image_header_read(Eet_File *ef,
const char *name,
unsigned int *w,
@ -1552,7 +1552,7 @@ eet_data_image_header_read(Eet_File *ef,
comp, quality, lossy);
}
EAPI void *
EET_API void *
eet_data_image_encode_cipher(const void *data,
const char *cipher_key,
unsigned int w,
@ -1625,7 +1625,7 @@ eet_data_image_encode_cipher(const void *data,
return d;
}
EAPI void *
EET_API void *
eet_data_image_encode(const void *data,
int *size_ret,
unsigned int w,
@ -1855,7 +1855,7 @@ eet_data_image_header_advance_decode_cipher(const void *data,
return r;
}
EAPI int
EET_API int
eet_data_image_header_decode_cipher(const void *data,
const char *cipher_key,
int size,
@ -1872,7 +1872,7 @@ eet_data_image_header_decode_cipher(const void *data,
NULL);
}
EAPI int
EET_API int
eet_data_image_colorspace_get(Eet_File *ef,
const char *name,
const char *cipher_key,
@ -1903,7 +1903,7 @@ eet_data_image_colorspace_get(Eet_File *ef,
return d;
}
EAPI int
EET_API int
eet_data_image_header_decode(const void *data,
int size,
unsigned int *w,
@ -2061,7 +2061,7 @@ _eet_data_image_decode_inside(const void *data,
return 1;
}
EAPI void *
EET_API void *
eet_data_image_decode_cipher(const void *data,
const char *cipher_key,
int size,
@ -2133,7 +2133,7 @@ eet_data_image_decode_cipher(const void *data,
return d;
}
EAPI void *
EET_API void *
eet_data_image_decode(const void *data,
int size,
unsigned int *w,
@ -2147,7 +2147,7 @@ eet_data_image_decode(const void *data,
alpha, comp, quality, lossy);
}
EAPI int
EET_API int
eet_data_image_decode_to_cspace_surface_cipher(const void *data,
const char *cipher_key,
int size,
@ -2237,7 +2237,7 @@ eet_data_image_decode_to_cspace_surface_cipher(const void *data,
return 1;
}
EAPI int
EET_API int
eet_data_image_decode_to_surface_cipher(const void *data,
const char *cipher_key,
int size,
@ -2255,7 +2255,7 @@ eet_data_image_decode_to_surface_cipher(const void *data,
return eet_data_image_decode_to_cspace_surface_cipher(data, cipher_key, size, src_x, src_y, d, w, h, row_stride, EET_COLORSPACE_ARGB8888, alpha, comp, quality, lossy);
}
EAPI int
EET_API int
eet_data_image_decode_to_surface(const void *data,
int size,
unsigned int src_x,

56
src/lib/eet/eet_lib.c
View File

@ -23,7 +23,7 @@
#endif
static Eet_Version _version = { VMAJ, VMIN, VMIC, VREV };
EAPI Eet_Version *eet_version = &_version;
EET_API Eet_Version *eet_version = &_version;
#ifdef HAVE_REALPATH
# undef HAVE_REALPATH
@ -536,7 +536,7 @@ sign_error:
return error;
}
EAPI int
EET_API int
eet_init(void)
{
if (++eet_init_count != 1)
@ -590,7 +590,7 @@ shutdown_eina:
return --eet_init_count;
}
EAPI int
EET_API int
eet_shutdown(void)
{
if (eet_init_count <= 0)
@ -647,7 +647,7 @@ eet_shutdown(void)
return eet_init_count;
}
EAPI Eet_Error
EET_API Eet_Error
eet_sync(Eet_File *ef)
{
Eet_Error ret;
@ -670,7 +670,7 @@ eet_sync(Eet_File *ef)
return ret;
}
EAPI void
EET_API void
eet_clearcache(void)
{
int num = 0;
@ -1383,7 +1383,7 @@ on_error:
return EET_ERROR_NONE;
}
EAPI Eet_File *
EET_API Eet_File *
eet_memopen_read(const void *data,
size_t size)
{
@ -1420,14 +1420,14 @@ eet_memopen_read(const void *data,
return ef;
}
EAPI const char *
EET_API const char *
eet_file_get(Eet_File *ef)
{
if (eet_check_pointer(ef)) return NULL;
return ef->path;
}
EAPI Eet_File *
EET_API Eet_File *
eet_mmap(const Eina_File *file)
{
Eet_File *ef = NULL;
@ -1495,7 +1495,7 @@ eet_mmap(const Eina_File *file)
return NULL;
}
EAPI Eet_File *
EET_API Eet_File *
eet_open(const char *file,
Eet_File_Mode mode)
{
@ -1665,7 +1665,7 @@ on_error:
return NULL;
}
EAPI Eet_File_Mode
EET_API Eet_File_Mode
eet_mode_get(Eet_File *ef)
{
/* check to see its' an eet file pointer */
@ -1794,7 +1794,7 @@ _base64_dec(const char *file, int *size_ret)
return data;
}
EAPI Eina_Bool
EET_API Eina_Bool
eet_identity_verify(Eet_File *ef,
const char *certificate_file)
{
@ -1825,7 +1825,7 @@ eet_identity_verify(Eet_File *ef,
return EINA_TRUE;
}
EAPI const void *
EET_API const void *
eet_identity_x509(Eet_File *ef,
int *der_length)
{
@ -1841,7 +1841,7 @@ eet_identity_x509(Eet_File *ef,
return ef->x509_der;
}
EAPI const void *
EET_API const void *
eet_identity_signature(Eet_File *ef,
int *signature_length)
{
@ -1857,7 +1857,7 @@ eet_identity_signature(Eet_File *ef,
return ef->signature;
}
EAPI const void *
EET_API const void *
eet_identity_sha1(Eet_File *ef,
int *sha1_length)
{
@ -1875,7 +1875,7 @@ eet_identity_sha1(Eet_File *ef,
return ef->sha1;
}
EAPI Eet_Error
EET_API Eet_Error
eet_identity_set(Eet_File *ef,
Eet_Key *key)
{
@ -1895,13 +1895,13 @@ eet_identity_set(Eet_File *ef,
return EET_ERROR_NONE;
}
EAPI Eet_Error
EET_API Eet_Error
eet_close(Eet_File *ef)
{
return eet_internal_close(ef, EINA_FALSE, EINA_FALSE);
}
EAPI void *
EET_API void *
eet_read_cipher(Eet_File *ef,
const char *name,
int *size_ret,
@ -2002,7 +2002,7 @@ on_error:
return NULL;
}
EAPI void *
EET_API void *
eet_read(Eet_File *ef,
const char *name,
int *size_ret)
@ -2010,7 +2010,7 @@ eet_read(Eet_File *ef,
return eet_read_cipher(ef, name, size_ret, NULL);
}
EAPI const void *
EET_API const void *
eet_read_direct(Eet_File *ef,
const char *name,
int *size_ret)
@ -2114,7 +2114,7 @@ on_error:
return NULL;
}
EAPI const char *
EET_API const char *
eet_alias_get(Eet_File *ef,
const char *name)
{
@ -2216,7 +2216,7 @@ eet_define_data(Eet_File *ef, Eet_File_Node *efn, Eina_Binbuf *data, int origina
efn->offset = ef->data_size + 1;
}
EAPI Eina_Bool
EET_API Eina_Bool
eet_alias(Eet_File *ef,
const char *name,
const char *destination,
@ -2338,7 +2338,7 @@ on_error:
return success;
}
EAPI int
EET_API int
eet_write_cipher(Eet_File *ef,
const char *name,
const void *data,
@ -2488,7 +2488,7 @@ on_error:
return 0;
}
EAPI int
EET_API int
eet_write(Eet_File *ef,
const char *name,
const void *data,
@ -2498,7 +2498,7 @@ eet_write(Eet_File *ef,
return eet_write_cipher(ef, name, data, size, comp, NULL);
}
EAPI int
EET_API int
eet_delete(Eet_File *ef,
const char *name)
{
@ -2560,7 +2560,7 @@ eet_delete(Eet_File *ef,
return exists_already;
}
EAPI Eet_Dictionary *
EET_API Eet_Dictionary *
eet_dictionary_get(Eet_File *ef)
{
if (eet_check_pointer(ef))
@ -2569,7 +2569,7 @@ eet_dictionary_get(Eet_File *ef)
return ef->ed;
}
EAPI char **
EET_API char **
eet_list(Eet_File *ef,
const char *glob,
int *count_ret)
@ -2653,7 +2653,7 @@ on_error:
return NULL;
}
EAPI int
EET_API int
eet_num_entries(Eet_File *ef)
{
int i, num, ret = 0;
@ -2773,7 +2773,7 @@ _eet_entries_iterator_unlock(Eet_Entries_Iterator *it)
return EINA_TRUE;
}
EAPI Eina_Iterator *
EET_API Eina_Iterator *
eet_list_entries(Eet_File *ef)
{
Eet_Entries_Iterator *it;

4
src/lib/eet/eet_node.c
View File

@ -62,7 +62,7 @@ _eet_node_append(Eet_Node *n,
}
#define EET_NODE_NEW(Eet_type, Name, Value, Type) \
EAPI Eet_Node * \
EET_API Eet_Node * \
eet_node_ ## Name ## _new(const char *name, Type Value) \
{ \
Eet_Node *n; \
@ -76,7 +76,7 @@ _eet_node_append(Eet_Node *n,
}
#define EET_NODE_STR_NEW(Eet_type, Name, Value, Type) \
EAPI Eet_Node * \
EET_API Eet_Node * \
eet_node_ ## Name ## _new(const char *name, Type Value) \
{ \
Eet_Node *n; \

2
src/lib/eet/meson.build
View File

@ -21,7 +21,7 @@ eet_src = files([
eet_lib = library('eet',
eet_src, pub_eo_file_target,
c_args : package_c_args,
c_args : [package_c_args, '-DEET_BUILD'],
dependencies: eet_deps + eet_pub_deps + eet_ext_deps,
include_directories : config_dir,
install: true,