[Pkg-e-commits] [SCM] Core abstraction layer for enlightenment DR 0.17 branch, upstream-vcs, updated. fbccf3b6cae3945e0db311041de91f346fccbae1
doursse
doursse at alioth.debian.org
Mon Jun 9 12:18:49 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit 9abf2f5dffc7734bc20e22db6b5ba90c35a28970
Author: doursse <doursse>
Date: Mon May 26 05:31:20 2008 +0000
remove ecore_pipe declarations and some trailing spaces
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index dcdcfdf..e6a6620 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -67,7 +67,7 @@ extern "C" {
#endif
#define ECORE_CALLBACK_CANCEL 0 /**< Return value to remove a callback */
-#define ECORE_CALLBACK_RENEW 1 /**< Return value to keep a callback */
+#define ECORE_CALLBACK_RENEW 1 /**< Return value to keep a callback */
#define ECORE_EVENT_NONE 0
#define ECORE_EVENT_SIGNAL_USER 1 /**< User signal event */
@@ -110,7 +110,7 @@ extern "C" {
ECORE_POLLER_CORE = 0 /**< The core poller interval */
};
typedef enum _Ecore_Poller_Type Ecore_Poller_Type;
-
+
#ifndef _WIN32
typedef void Ecore_Exe; /**< A handle for spawned processes */
#endif
@@ -124,7 +124,6 @@ extern "C" {
typedef void Ecore_Event; /**< A handle for an event */
typedef void Ecore_Animator; /**< A handle for animators */
typedef void Ecore_Poller; /**< A handle for pollers */
- typedef void Ecore_Pipe; /**< A handle for pipes */
#endif
typedef struct _Ecore_Event_Signal_User Ecore_Event_Signal_User; /**< User signal event */
typedef struct _Ecore_Event_Signal_Hup Ecore_Event_Signal_Hup; /**< Hup signal event */
@@ -299,12 +298,7 @@ extern "C" {
EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, int (*func) (void *data), const void *data);
EAPI void *ecore_poller_del(Ecore_Poller *poller);
- EAPI Ecore_Pipe *ecore_pipe_new (void (*handler) (void *data));
- EAPI void ecore_pipe_free(Ecore_Pipe *pipe);
- EAPI void ecore_pipe_write(Ecore_Pipe *pipe,
- void *data);
-
#ifdef __cplusplus
}
#endif
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index eb45fe2..50ae9b9 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -247,7 +247,6 @@ typedef struct _Ecore_Event_Filter Ecore_Event_Filter;
typedef struct _Ecore_Event Ecore_Event;
typedef struct _Ecore_Animator Ecore_Animator;
typedef struct _Ecore_Poller Ecore_Poller;
-typedef struct _Ecore_Pipe Ecore_Pipe;
#ifndef _WIN32
struct _Ecore_Exe
@@ -397,14 +396,6 @@ struct _Ecore_Poller
void *data;
};
-struct _Ecore_Pipe
-{
- int fd_read;
- int fd_write;
- int event_data;
- void (*handler) (void *data);
-};
-
#endif
EAPI void _ecore_magic_fail(void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname);
@@ -467,7 +458,7 @@ void _ecore_exe_event_del_free(void *data, void *ev);
void _ecore_animator_shutdown(void);
void _ecore_poller_shutdown(void);
-
+
EAPI void *_ecore_list2_append (void *in_list, void *in_item);
EAPI void *_ecore_list2_prepend (void *in_list, void *in_item);
EAPI void *_ecore_list2_append_relative (void *in_list, void *in_item, void *in_relative);
--
Core abstraction layer for enlightenment DR 0.17
More information about the Pkg-e-commits
mailing list