discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=dea3ae21ad59918cb7e2f3f79dd1477c54991536
commit dea3ae21ad59918cb7e2f3f79dd1477c54991536 Author: Mike Blumenkrantz <zm...@osg.samsung.com> Date: Fri Apr 8 11:50:27 2016 -0400 directly include e.h in efm device backends fixes some compile errors related to include ordering ref 68587276cfa2411e3f12e85e94878e27048df19b --- src/bin/e_fm/e_fm_main_eeze.c | 28 +--------------------- src/bin/e_fm/e_fm_main_udisks.c | 50 +--------------------------------------- src/bin/e_fm/e_fm_main_udisks2.c | 50 +--------------------------------------- 3 files changed, 3 insertions(+), 125 deletions(-) diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c index bc86246..8f22ace 100644 --- a/src/bin/e_fm/e_fm_main_eeze.c +++ b/src/bin/e_fm/e_fm_main_eeze.c @@ -1,33 +1,7 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef HAVE_ALLOCA_H -# include <alloca.h> -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include <malloc.h> -# define alloca _alloca -#else -# include <stddef.h> -# ifdef __cplusplus -extern "C" -# endif -void *alloca(size_t); -#endif - +#include "e.h" #ifdef __linux__ #include <features.h> #endif -#include <stdio.h> -#include <unistd.h> -#include <errno.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> #include <Eet.h> #include <Eeze.h> #include <Eeze_Disk.h> diff --git a/src/bin/e_fm/e_fm_main_udisks.c b/src/bin/e_fm/e_fm_main_udisks.c index a4592bf..82ffa4b 100644 --- a/src/bin/e_fm/e_fm_main_udisks.c +++ b/src/bin/e_fm/e_fm_main_udisks.c @@ -1,52 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef HAVE_ALLOCA_H -# include <alloca.h> -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include <malloc.h> -# define alloca _alloca -#else -# include <stddef.h> -# ifdef __cplusplus -extern "C" -# endif -void *alloca(size_t); -#endif - -#ifdef __linux__ -#include <features.h> -#endif -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> -#include <sys/param.h> -#include <utime.h> -#include <math.h> -#include <fnmatch.h> -#include <limits.h> -#include <ctype.h> -#include <time.h> -#include <dirent.h> -#include <pwd.h> -#include <glob.h> -#include <errno.h> -#include <signal.h> -#include <Ecore.h> -#include <Ecore_Ipc.h> -#include <Ecore_File.h> -#include <Eet.h> -#include <Eldbus.h> - +#include "e.h" #include "e_fm_shared_device.h" #include "e_fm_shared_codec.h" #include "e_fm_ipc.h" diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c index 993241c..a006989 100644 --- a/src/bin/e_fm/e_fm_main_udisks2.c +++ b/src/bin/e_fm/e_fm_main_udisks2.c @@ -1,52 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef HAVE_ALLOCA_H -# include <alloca.h> -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include <malloc.h> -# define alloca _alloca -#else -# include <stddef.h> -# ifdef __cplusplus -extern "C" -# endif -void *alloca(size_t); -#endif - -#ifdef __linux__ -#include <features.h> -#endif -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/time.h> -#include <sys/param.h> -#include <utime.h> -#include <math.h> -#include <fnmatch.h> -#include <limits.h> -#include <ctype.h> -#include <time.h> -#include <dirent.h> -#include <pwd.h> -#include <glob.h> -#include <errno.h> -#include <signal.h> -#include <Ecore.h> -#include <Ecore_Ipc.h> -#include <Ecore_File.h> -#include <Eet.h> -#include <Eldbus.h> - +#include "e.h" #include "e_fm_shared_device.h" #include "e_fm_shared_codec.h" #include "e_fm_ipc.h" --