summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore.h2
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore_Data.h2
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore_Str.h2
-rw-r--r--legacy/ecore/src/lib/ecore_con/Ecore_Con.h2
-rw-r--r--legacy/ecore/src/lib/ecore_config/Ecore_Config.h2
-rw-r--r--legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h2
-rw-r--r--legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h2
-rw-r--r--legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h2
-rw-r--r--legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h2
-rw-r--r--legacy/ecore/src/lib/ecore_file/Ecore_File.h2
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h2
-rw-r--r--legacy/ecore/src/lib/ecore_job/Ecore_Job.h2
-rw-r--r--legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h2
-rw-r--r--legacy/ecore/src/lib/ecore_x/Makefile.am30
-rw-r--r--legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c14
15 files changed, 27 insertions, 43 deletions
diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h
index 74f357341d..9676bdebba 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/legacy/ecore/src/lib/ecore/Ecore.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore/Ecore_Data.h b/legacy/ecore/src/lib/ecore/Ecore_Data.h
index dc265840ac..4a8389c050 100644
--- a/legacy/ecore/src/lib/ecore/Ecore_Data.h
+++ b/legacy/ecore/src/lib/ecore/Ecore_Data.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore/Ecore_Str.h b/legacy/ecore/src/lib/ecore/Ecore_Str.h
index 025f7024da..aa85683133 100644
--- a/legacy/ecore/src/lib/ecore/Ecore_Str.h
+++ b/legacy/ecore/src/lib/ecore/Ecore_Str.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h
index c67978c093..4c686210dd 100644
--- a/legacy/ecore/src/lib/ecore_con/Ecore_Con.h
+++ b/legacy/ecore/src/lib/ecore_con/Ecore_Con.h
@@ -7,7 +7,7 @@
7#ifdef EAPI 7#ifdef EAPI
8#undef EAPI 8#undef EAPI
9#endif 9#endif
10#ifdef _MSC_VER 10#ifdef WIN32
11# ifdef BUILDING_DLL 11# ifdef BUILDING_DLL
12# define EAPI __declspec(dllexport) 12# define EAPI __declspec(dllexport)
13# else 13# else
diff --git a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
index ccb8e0a1c0..5741e881d8 100644
--- a/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
+++ b/legacy/ecore/src/lib/ecore_config/Ecore_Config.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h b/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h
index c1cbcb08bc..ea49a7aab9 100644
--- a/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h
+++ b/legacy/ecore/src/lib/ecore_dbus/Ecore_DBus.h
@@ -10,7 +10,7 @@
10#ifdef EAPI 10#ifdef EAPI
11#undef EAPI 11#undef EAPI
12#endif 12#endif
13#ifdef _MSC_VER 13#ifdef WIN32
14# ifdef BUILDING_DLL 14# ifdef BUILDING_DLL
15# define EAPI __declspec(dllexport) 15# define EAPI __declspec(dllexport)
16# else 16# else
diff --git a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h
index 7f9e8982ef..eace6595a1 100644
--- a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h
+++ b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
index 6bcb5fafb1..4469495d79 100644
--- a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
+++ b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h b/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h
index 3eae77b774..b9f7e44019 100644
--- a/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h
+++ b/legacy/ecore/src/lib/ecore_fb/Ecore_Fb.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_file/Ecore_File.h b/legacy/ecore/src/lib/ecore_file/Ecore_File.h
index f08b3b4ad5..2fdda25ddf 100644
--- a/legacy/ecore/src/lib/ecore_file/Ecore_File.h
+++ b/legacy/ecore/src/lib/ecore_file/Ecore_File.h
@@ -12,7 +12,7 @@
12#ifdef EAPI 12#ifdef EAPI
13#undef EAPI 13#undef EAPI
14#endif 14#endif
15#ifdef _MSC_VER 15#ifdef WIN32
16# ifdef BUILDING_DLL 16# ifdef BUILDING_DLL
17# define EAPI __declspec(dllexport) 17# define EAPI __declspec(dllexport)
18# else 18# else
diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
index 9460178923..066103e1f6 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
+++ b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_job/Ecore_Job.h b/legacy/ecore/src/lib/ecore_job/Ecore_Job.h
index bb2da6c1e4..e4a3eee76c 100644
--- a/legacy/ecore/src/lib/ecore_job/Ecore_Job.h
+++ b/legacy/ecore/src/lib/ecore_job/Ecore_Job.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h b/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h
index b2bf6d5fee..adfe0d17ed 100644
--- a/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h
+++ b/legacy/ecore/src/lib/ecore_txt/Ecore_Txt.h
@@ -4,7 +4,7 @@
4#ifdef EAPI 4#ifdef EAPI
5#undef EAPI 5#undef EAPI
6#endif 6#endif
7#ifdef _MSC_VER 7#ifdef WIN32
8# ifdef BUILDING_DLL 8# ifdef BUILDING_DLL
9# define EAPI __declspec(dllexport) 9# define EAPI __declspec(dllexport)
10# else 10# else
diff --git a/legacy/ecore/src/lib/ecore_x/Makefile.am b/legacy/ecore/src/lib/ecore_x/Makefile.am
index 510b4f37cc..760a1b8b68 100644
--- a/legacy/ecore/src/lib/ecore_x/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_x/Makefile.am
@@ -2,14 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in
2 2
3INCLUDES = \ 3INCLUDES = \
4@Xcursor_cflags@ \ 4@Xcursor_cflags@ \
5@XDAMAGE_CFLAGS@ \ 5@Xrender_cflags@ \
6@XDPMS_CFLAGS@ \ 6@Xprint_cflags@ \
7@XFIXES_CFLAGS@ \ 7@Xinerama_cflags@ \
8@XINERAMA_CFLAGS@ \ 8@Xrandr_cflags@ \
9@XPRINT_CFLAGS@ \ 9@Xfixes_cflags@ \
10@XRANDR_CFLAGS@ \ 10@Xdamage_cflags@ \
11@XRENDER_CFLAGS@ \ 11@Xss_cflags@ \
12@XSS_CFLAGS@ \
13@x_cflags@ \ 12@x_cflags@ \
14-I$(top_srcdir)/src/lib/ecore \ 13-I$(top_srcdir)/src/lib/ecore \
15-I$(top_srcdir)/src/lib/ecore_txt \ 14-I$(top_srcdir)/src/lib/ecore_txt \
@@ -59,14 +58,13 @@ ecore_x_private.h
59 58
60libecore_x_la_LIBADD = \ 59libecore_x_la_LIBADD = \
61@Xcursor_libs@ \ 60@Xcursor_libs@ \
62@XDAMAGE_LIBS@ \ 61@Xrender_libs@ \
63@XDPMS_LIBS@ \ 62@Xprint_libs@ \
64@XFIXES_LIBS@ \ 63@Xinerama_libs@ \
65@XINERAMA_LIBS@ \ 64@Xrandr_libs@ \
66@XPRINT_LIBS@ \ 65@Xfixes_libs@ \
67@XRANDR_LIBS@ \ 66@Xdamage_libs@ \
68@XRENDER_LIBS@ \ 67@Xss_libs@ \
69@XSS_LIBS@ \
70@x_libs@ \ 68@x_libs@ \
71$(top_builddir)/src/lib/ecore/libecore.la \ 69$(top_builddir)/src/lib/ecore/libecore.la \
72$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \ 70$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c b/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c
index efc1c9c02e..da0b17763e 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_drawable.c
@@ -1,25 +1,13 @@
1/*
2 * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
3 */
4
5#include "ecore_x_private.h" 1#include "ecore_x_private.h"
6 2
7 3
8/** 4/**
9 * @defgroup Ecore_X_Drawable_Group X Drawable Functions
10 *
11 * Functions that operate on drawables.
12 */
13
14
15/**
16 * Retrieves the geometry of the given drawable. 5 * Retrieves the geometry of the given drawable.
17 * @param d The given drawable. 6 * @param d The given drawable.
18 * @param x Pointer to an integer into which the X position is to be stored. 7 * @param x Pointer to an integer into which the X position is to be stored.
19 * @param y Pointer to an integer into which the Y position is to be stored. 8 * @param y Pointer to an integer into which the Y position is to be stored.
20 * @param w Pointer to an integer into which the width is to be stored. 9 * @param w Pointer to an integer into which the width is to be stored.
21 * @param h Pointer to an integer into which the height is to be stored. 10 * @param h Pointer to an integer into which the height is to be stored.
22 * @ingroup Ecore_X_Drawable_Group
23 */ 11 */
24EAPI void 12EAPI void
25ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h) 13ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h)
@@ -47,7 +35,6 @@ ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h
47 * Retrieves the width of the border of the given drawable. 35 * Retrieves the width of the border of the given drawable.
48 * @param d The given drawable. 36 * @param d The given drawable.
49 * @return The border width of the given drawable. 37 * @return The border width of the given drawable.
50 * @ingroup Ecore_X_Drawable_Group
51 */ 38 */
52EAPI int 39EAPI int
53ecore_x_drawable_border_width_get(Ecore_X_Drawable d) 40ecore_x_drawable_border_width_get(Ecore_X_Drawable d)
@@ -67,7 +54,6 @@ ecore_x_drawable_border_width_get(Ecore_X_Drawable d)
67 * Retrieves the depth of the given drawable. 54 * Retrieves the depth of the given drawable.
68 * @param d The given drawable. 55 * @param d The given drawable.
69 * @return The depth of the given drawable. 56 * @return The depth of the given drawable.
70 * @ingroup Ecore_X_Drawable_Group
71 */ 57 */
72EAPI int 58EAPI int
73ecore_x_drawable_depth_get(Ecore_X_Drawable d) 59ecore_x_drawable_depth_get(Ecore_X_Drawable d)