summaryrefslogtreecommitdiff
path: root/src/bin/e_fm
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-05-07 15:13:10 -0400
committerChris Michael <cp.michael@samsung.com>2015-05-07 15:13:10 -0400
commit0a94e8ba71f81db78363e4d4e7df8a8b9020216d (patch)
tree1511219387622b5fa810bbe619f4f5d93d9b9ef8 /src/bin/e_fm
parent93971bb6fc9e6bad85a7206f37391d94e7af9b11 (diff)
enlightenment: Make E build again with EFL from git
sed -i 's/EAPI/E_API/g' Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/bin/e_fm')
-rw-r--r--src/bin/e_fm/e_fm_ipc.h19
-rw-r--r--src/bin/e_fm/e_fm_main.c18
-rw-r--r--src/bin/e_fm/e_fm_main.h25
-rw-r--r--src/bin/e_fm/e_fm_main_udisks2.c4
4 files changed, 48 insertions, 18 deletions
diff --git a/src/bin/e_fm/e_fm_ipc.h b/src/bin/e_fm/e_fm_ipc.h
index 5389d261b..0476c0fd8 100644
--- a/src/bin/e_fm/e_fm_ipc.h
+++ b/src/bin/e_fm/e_fm_ipc.h
@@ -1,6 +1,7 @@
1#ifndef E_FM_IPC_H 1#ifndef E_FM_IPC_H
2#define E_FM_IPC_H 2#define E_FM_IPC_H
3 3
4#include "e_fm_main.h"
4#include "e_fm_shared_types.h" 5#include "e_fm_shared_types.h"
5 6
6int _e_fm_ipc_init(void); 7int _e_fm_ipc_init(void);
@@ -9,16 +10,16 @@ Eina_Bool _e_fm_ipc_slave_error_cb(void *data, int type, void *event);
9Eina_Bool _e_fm_ipc_slave_del_cb(void *data, int type, void *event); 10Eina_Bool _e_fm_ipc_slave_del_cb(void *data, int type, void *event);
10void e_fm_ipc_volume_add(E_Volume *v); 11void e_fm_ipc_volume_add(E_Volume *v);
11 12
12EAPI E_Storage *e_storage_add(const char *udi); 13E_API E_Storage *e_storage_add(const char *udi);
13EAPI void e_storage_del(const char *udi); 14E_API void e_storage_del(const char *udi);
14EAPI E_Storage *e_storage_find(const char *udi); 15E_API E_Storage *e_storage_find(const char *udi);
15 16
16EAPI E_Volume *e_volume_add(const char *udi, char first_time); 17E_API E_Volume *e_volume_add(const char *udi, char first_time);
17EAPI void e_volume_del(const char *udi); 18E_API void e_volume_del(const char *udi);
18EAPI E_Volume *e_volume_find(const char *udi); 19E_API E_Volume *e_volume_find(const char *udi);
19 20
20EAPI void e_volume_mount(E_Volume *v); 21E_API void e_volume_mount(E_Volume *v);
21EAPI void e_volume_unmount(E_Volume *v); 22E_API void e_volume_unmount(E_Volume *v);
22EAPI void e_volume_eject(E_Volume *v); 23E_API void e_volume_eject(E_Volume *v);
23 24
24#endif 25#endif
diff --git a/src/bin/e_fm/e_fm_main.c b/src/bin/e_fm/e_fm_main.c
index e24cc46ca..a1317d680 100644
--- a/src/bin/e_fm/e_fm_main.c
+++ b/src/bin/e_fm/e_fm_main.c
@@ -46,6 +46,8 @@ void *alloca (size_t);
46#include <Ecore_File.h> 46#include <Ecore_File.h>
47#include <Eet.h> 47#include <Eet.h>
48 48
49#include "e_fm_main.h"
50
49#define E_TYPEDEFS 51#define E_TYPEDEFS
50#include "e_config_data.h" 52#include "e_config_data.h"
51#include "e_fm_op.h" 53#include "e_fm_op.h"
@@ -77,8 +79,8 @@ static Efm_Mode mode = EFM_MODE_USING_RASTER_MOUNT;
77 * 79 *
78 */ 80 */
79 81
80#ifndef EAPI 82#ifndef E_API
81#define EAPI 83#define E_API
82#endif 84#endif
83 85
84#include "e_fm_main.h" 86#include "e_fm_main.h"
@@ -217,7 +219,7 @@ _e_volume_free(E_Volume *v)
217 219
218/* API functions */ 220/* API functions */
219 221
220EAPI void 222E_API void
221e_volume_mount(E_Volume *v) 223e_volume_mount(E_Volume *v)
222{ 224{
223 switch (mode) 225 switch (mode)
@@ -242,7 +244,7 @@ e_volume_mount(E_Volume *v)
242} 244}
243 245
244 246
245EAPI void 247E_API void
246e_volume_unmount(E_Volume *v) 248e_volume_unmount(E_Volume *v)
247{ 249{
248 switch (mode) 250 switch (mode)
@@ -266,7 +268,7 @@ e_volume_unmount(E_Volume *v)
266 } 268 }
267} 269}
268 270
269EAPI void 271E_API void
270e_volume_eject(E_Volume *v) 272e_volume_eject(E_Volume *v)
271{ 273{
272 switch (mode) 274 switch (mode)
@@ -290,7 +292,7 @@ e_volume_eject(E_Volume *v)
290 } 292 }
291} 293}
292 294
293EAPI E_Volume * 295E_API E_Volume *
294e_volume_find(const char *udi) 296e_volume_find(const char *udi)
295{ 297{
296 switch (mode) 298 switch (mode)
@@ -312,7 +314,7 @@ e_volume_find(const char *udi)
312 return NULL; 314 return NULL;
313} 315}
314 316
315EAPI void 317E_API void
316e_storage_del(const char *udi) 318e_storage_del(const char *udi)
317{ 319{
318 switch (mode) 320 switch (mode)
@@ -336,7 +338,7 @@ e_storage_del(const char *udi)
336 } 338 }
337} 339}
338 340
339EAPI E_Storage * 341E_API E_Storage *
340e_storage_find(const char *udi) 342e_storage_find(const char *udi)
341{ 343{
342 switch (mode) 344 switch (mode)
diff --git a/src/bin/e_fm/e_fm_main.h b/src/bin/e_fm/e_fm_main.h
index 849adf9e0..1ff95eff3 100644
--- a/src/bin/e_fm/e_fm_main.h
+++ b/src/bin/e_fm/e_fm_main.h
@@ -13,6 +13,31 @@
13#define ERR(...) EINA_LOG_DOM_ERR(efm_log_dom, __VA_ARGS__) 13#define ERR(...) EINA_LOG_DOM_ERR(efm_log_dom, __VA_ARGS__)
14#define CRI(...) EINA_LOG_DOM_CRIT(efm_log_dom, __VA_ARGS__) 14#define CRI(...) EINA_LOG_DOM_CRIT(efm_log_dom, __VA_ARGS__)
15 15
16# ifdef E_API
17# undef E_API
18# endif
19# ifdef WIN32
20# ifdef BUILDING_DLL
21# define E_API __declspec(dllexport)
22# else
23# define E_API __declspec(dllimport)
24# endif
25# else
26# ifdef __GNUC__
27# if __GNUC__ >= 4
28/* BROKEN in gcc 4 on amd64 */
29# if 0
30# pragma GCC visibility push(hidden)
31# endif
32# define E_API __attribute__ ((visibility("default")))
33# else
34# define E_API
35# endif
36# else
37# define E_API
38# endif
39# endif
40
16extern Ecore_Ipc_Server *_e_fm_ipc_server; 41extern Ecore_Ipc_Server *_e_fm_ipc_server;
17extern int efm_log_dom; 42extern int efm_log_dom;
18 43
diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c
index 5431bc3d7..5441fe968 100644
--- a/src/bin/e_fm/e_fm_main_udisks2.c
+++ b/src/bin/e_fm/e_fm_main_udisks2.c
@@ -919,7 +919,9 @@ _volume_eject_umount_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p
919 E_Volume *v = data; 919 E_Volume *v = data;
920 920
921 if (eldbus_message_error_get(msg, &name, &txt)) 921 if (eldbus_message_error_get(msg, &name, &txt))
922 ERR("%s: %s", name, txt); 922 {
923 ERR("%s: %s", name, txt);
924 }
923 else if (v->optype == E_VOLUME_OP_TYPE_EJECT) 925 else if (v->optype == E_VOLUME_OP_TYPE_EJECT)
924 { 926 {
925 vols_ejecting = eina_list_remove(vols_ejecting, v); 927 vols_ejecting = eina_list_remove(vols_ejecting, v);