Ecore: include orders, minor formatting
SVN revision: 79438
This commit is contained in:
parent
bf9ce78446
commit
a263978d34
|
@ -21,6 +21,7 @@ ecore_anim.c \
|
||||||
ecore_app.c \
|
ecore_app.c \
|
||||||
ecore_events.c \
|
ecore_events.c \
|
||||||
ecore_getopt.c \
|
ecore_getopt.c \
|
||||||
|
ecore_glib.c \
|
||||||
ecore_idle_enterer.c \
|
ecore_idle_enterer.c \
|
||||||
ecore_idle_exiter.c \
|
ecore_idle_exiter.c \
|
||||||
ecore_idler.c \
|
ecore_idler.c \
|
||||||
|
@ -31,7 +32,6 @@ ecore_poll.c \
|
||||||
ecore_time.c \
|
ecore_time.c \
|
||||||
ecore_timer.c \
|
ecore_timer.c \
|
||||||
ecore_thread.c \
|
ecore_thread.c \
|
||||||
ecore_glib.c \
|
|
||||||
ecore_throttle.c \
|
ecore_throttle.c \
|
||||||
ecore_private.h
|
ecore_private.h
|
||||||
|
|
||||||
|
@ -69,5 +69,5 @@ endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libecore_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @GLIB_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ @rt_libs@ -lm
|
libecore_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @GLIB_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ @rt_libs@ -lm
|
||||||
libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
|
libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
#include <Eo.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#include "Eo.h"
|
|
||||||
|
|
||||||
#define MY_CLASS ECORE_ANIMATOR_CLASS
|
#define MY_CLASS ECORE_ANIMATOR_CLASS
|
||||||
|
|
||||||
#define MY_CLASS_NAME "ecore_animator"
|
#define MY_CLASS_NAME "ecore_animator"
|
||||||
|
|
|
@ -4,9 +4,11 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#else
|
#endif
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
# include <process.h>
|
# include <process.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -2,21 +2,30 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef STDC_HEADERS
|
||||||
|
# include <stdlib.h>
|
||||||
|
# include <stddef.h>
|
||||||
|
#else
|
||||||
|
# ifdef HAVE_STDLIB_H
|
||||||
|
# include <stdlib.h>
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
#ifdef HAVE_ALLOCA_H
|
#ifdef HAVE_ALLOCA_H
|
||||||
# include <alloca.h>
|
# include <alloca.h>
|
||||||
#elif defined __GNUC__
|
#elif !defined alloca
|
||||||
# define alloca __builtin_alloca
|
# ifdef __GNUC__
|
||||||
#elif defined _AIX
|
# define alloca __builtin_alloca
|
||||||
# define alloca __alloca
|
# elif defined _AIX
|
||||||
#elif defined _MSC_VER
|
# define alloca __alloca
|
||||||
# include <malloc.h>
|
# elif defined _MSC_VER
|
||||||
# define alloca _alloca
|
# include <malloc.h>
|
||||||
#else
|
# define alloca _alloca
|
||||||
# include <stddef.h>
|
# elif !defined HAVE_ALLOCA
|
||||||
# ifdef __cplusplus
|
# ifdef __cplusplus
|
||||||
extern "C"
|
extern "C"
|
||||||
|
# endif
|
||||||
|
void *alloca (size_t);
|
||||||
# endif
|
# endif
|
||||||
void *alloca(size_t);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#ifdef HAVE_GLIB
|
#ifdef HAVE_GLIB
|
||||||
#include <glib.h>
|
# include <glib.h>
|
||||||
|
|
||||||
static Eina_Bool _ecore_glib_active = EINA_FALSE;
|
static Eina_Bool _ecore_glib_active = EINA_FALSE;
|
||||||
static Ecore_Select_Function _ecore_glib_select_original;
|
static Ecore_Select_Function _ecore_glib_select_original;
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <Eo.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#include "Eo.h"
|
|
||||||
|
|
||||||
#define MY_CLASS ECORE_IDLE_ENTERER_CLASS
|
#define MY_CLASS ECORE_IDLE_ENTERER_CLASS
|
||||||
|
|
||||||
#define MY_CLASS_NAME "ecore_idle_enterer"
|
#define MY_CLASS_NAME "ecore_idle_enterer"
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <Eo.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#include "Eo.h"
|
|
||||||
|
|
||||||
#define MY_CLASS ECORE_IDLE_EXITER_CLASS
|
#define MY_CLASS ECORE_IDLE_EXITER_CLASS
|
||||||
|
|
||||||
#define MY_CLASS_NAME "ecore_idle_exiter"
|
#define MY_CLASS_NAME "ecore_idle_exiter"
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <Eo.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#include "Eo.h"
|
|
||||||
|
|
||||||
#define MY_CLASS ECORE_IDLER_CLASS
|
#define MY_CLASS ECORE_IDLER_CLASS
|
||||||
|
|
||||||
#define MY_CLASS_NAME "ecore_idler"
|
#define MY_CLASS_NAME "ecore_idler"
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Eo.h>
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <Eo.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
|
|
|
@ -23,10 +23,15 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifdef HAVE_SYS_TIME_H
|
||||||
# include <sys/time.h>
|
# include <sys/time.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#else
|
#endif
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
# include <float.h>
|
# include <float.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -113,15 +118,15 @@ epoll_ctl(int epfd __UNUSED__,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_SYS_TIMERFD_H
|
#ifdef HAVE_SYS_TIMERFD_H
|
||||||
#include <sys/timerfd.h>
|
# include <sys/timerfd.h>
|
||||||
#else
|
#else
|
||||||
/* fallback code if we don't have real timerfd - reduces number of ifdefs */
|
/* fallback code if we don't have real timerfd - reduces number of ifdefs */
|
||||||
#ifndef CLOCK_MONOTONIC
|
# ifndef CLOCK_MONOTONIC
|
||||||
#define CLOCK_MONOTONIC 0 /* bogus value */
|
# define CLOCK_MONOTONIC 0 /* bogus value */
|
||||||
#endif
|
# endif
|
||||||
#ifndef TFD_NONBLOCK
|
# ifndef TFD_NONBLOCK
|
||||||
#define TFD_NONBLOCK 0 /* bogus value */
|
# define TFD_NONBLOCK 0 /* bogus value */
|
||||||
#endif
|
# endif
|
||||||
static inline int
|
static inline int
|
||||||
timerfd_create(int clockid __UNUSED__,
|
timerfd_create(int clockid __UNUSED__,
|
||||||
int flags __UNUSED__)
|
int flags __UNUSED__)
|
||||||
|
|
|
@ -40,12 +40,6 @@
|
||||||
# include <Exotic.h>
|
# include <Exotic.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Ecore.h"
|
|
||||||
#include "ecore_private.h"
|
|
||||||
|
|
||||||
/* How of then we should retry to write to the pipe */
|
|
||||||
#define ECORE_PIPE_WRITE_RETRY 6
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* On Windows, pipe() is implemented with sockets.
|
* On Windows, pipe() is implemented with sockets.
|
||||||
* Contrary to Linux, Windows uses different functions
|
* Contrary to Linux, Windows uses different functions
|
||||||
|
@ -78,9 +72,12 @@
|
||||||
|
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
#include <Ecore.h>
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
|
/* How of then we should retry to write to the pipe */
|
||||||
|
#define ECORE_PIPE_WRITE_RETRY 6
|
||||||
|
|
||||||
struct _Ecore_Pipe
|
struct _Ecore_Pipe
|
||||||
{
|
{
|
||||||
ECORE_MAGIC;
|
ECORE_MAGIC;
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <Eo.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#include "Eo.h"
|
|
||||||
|
|
||||||
#define MY_CLASS ECORE_POLLER_CLASS
|
#define MY_CLASS ECORE_POLLER_CLASS
|
||||||
|
|
||||||
#define MY_CLASS_NAME "ecore_poller"
|
#define MY_CLASS_NAME "ecore_poller"
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -7,7 +6,10 @@
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <unistd.h>
|
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
|
# include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_EVIL
|
#ifdef HAVE_EVIL
|
||||||
# include <Evil.h>
|
# include <Evil.h>
|
||||||
|
|
|
@ -3,7 +3,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
|
# include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
|
@ -16,11 +16,11 @@
|
||||||
# include <mach/mach_time.h>
|
# include <mach/mach_time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
|
#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
|
||||||
static clockid_t _ecore_time_clock_id = -1;
|
static clockid_t _ecore_time_clock_id = -1;
|
||||||
#elif defined(__APPLE__) && defined(__MACH__)
|
#elif defined(__APPLE__) && defined(__MACH__)
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include <Eo.h>
|
||||||
|
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
#include "Eo.h"
|
|
||||||
|
|
||||||
#define MY_CLASS ECORE_TIMER_CLASS
|
#define MY_CLASS ECORE_TIMER_CLASS
|
||||||
#define MY_CLASS_NAME "ecore_timer"
|
#define MY_CLASS_NAME "ecore_timer"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue