From 856f12239042c1b343f10c96ef50b3bf0bf66e4d Mon Sep 17 00:00:00 2001 From: etrunko Date: Wed, 13 Oct 2010 19:10:43 +0000 Subject: [PATCH] e_dbus: Small misidentation fix git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@53378 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ofono/e_ofono_private.h | 68 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/lib/ofono/e_ofono_private.h b/src/lib/ofono/e_ofono_private.h index 8decac8..c5d0df1 100644 --- a/src/lib/ofono/e_ofono_private.h +++ b/src/lib/ofono/e_ofono_private.h @@ -1,30 +1,30 @@ - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif - - #ifdef HAVE_ALLOCA_H - # include - #elif defined __GNUC__ - # define alloca __builtin_alloca - #elif defined _AIX - # define alloca __alloca - #elif defined _MSC_VER - # include - # define alloca _alloca - #else - # include - # ifdef __cplusplus +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef HAVE_ALLOCA_H +# include +#elif defined __GNUC__ +# define alloca __builtin_alloca +#elif defined _AIX +# define alloca __alloca +#elif defined _MSC_VER +# include +# define alloca _alloca +#else +# include +# ifdef __cplusplus extern "C" - # endif +# endif void * alloca (size_t); - #endif +#endif - #include +#include - #include - #include +#include +#include - #include "E_Ofono.h" +#include "E_Ofono.h" static const char manager_path[] = "/"; @@ -45,19 +45,19 @@ extern const char *e_ofono_method_send_sms; extern int _e_dbus_ofono_log_dom; - #ifndef EINA_LOG_DEFAULT_COLOR - #define EINA_LOG_DEFAULT_COLOR EINA_COLOR_CYAN - #endif +#ifndef EINA_LOG_DEFAULT_COLOR +#define EINA_LOG_DEFAULT_COLOR EINA_COLOR_CYAN +#endif - #undef DBG - #undef INF - #undef WRN - #undef ERR +#undef DBG +#undef INF +#undef WRN +#undef ERR - #define DBG(...) EINA_LOG_DOM_DBG(_e_dbus_ofono_log_dom, __VA_ARGS__) - #define INF(...) EINA_LOG_DOM_INFO(_e_dbus_ofono_log_dom, __VA_ARGS__) - #define WRN(...) EINA_LOG_DOM_WARN(_e_dbus_ofono_log_dom, __VA_ARGS__) - #define ERR(...) EINA_LOG_DOM_ERR(_e_dbus_ofono_log_dom, __VA_ARGS__) +#define DBG(...) EINA_LOG_DOM_DBG(_e_dbus_ofono_log_dom, __VA_ARGS__) +#define INF(...) EINA_LOG_DOM_INFO(_e_dbus_ofono_log_dom, __VA_ARGS__) +#define WRN(...) EINA_LOG_DOM_WARN(_e_dbus_ofono_log_dom, __VA_ARGS__) +#define ERR(...) EINA_LOG_DOM_ERR(_e_dbus_ofono_log_dom, __VA_ARGS__) typedef struct _E_Ofono_Array E_Ofono_Array; @@ -103,7 +103,7 @@ __dbus_iter_type_check(int type, int expected, const char *expected_name) return 0; } - #define _dbus_iter_type_check(t, e) __dbus_iter_type_check(t, e, # e) +#define _dbus_iter_type_check(t, e) __dbus_iter_type_check(t, e, # e) extern E_DBus_Connection *e_ofono_conn; -- 2.7.4