cedric pushed a commit to branch master. http://git.enlightenment.org/games/etrophy.git/commit/?id=75789bcd16ce904ad7ef507814fa12ad6a279e4a
commit 75789bcd16ce904ad7ef507814fa12ad6a279e4a Author: Cedric Bail <[email protected]> Date: Sun Dec 8 14:02:33 2013 +0900 lib: remove code that doesn't make sense and was caught in cross-compilation. --- src/lib/etrophy.c | 70 +++++++++++++++++++++-------------------------- src/lib/etrophy_layouts.c | 8 ------ 2 files changed, 31 insertions(+), 47 deletions(-) diff --git a/src/lib/etrophy.c b/src/lib/etrophy.c index 9087134..d6f2fba 100644 --- a/src/lib/etrophy.c +++ b/src/lib/etrophy.c @@ -40,10 +40,6 @@ #endif #define CRIT(...) EINA_LOG_DOM_CRIT(_etrophy_log_dom, __VA_ARGS__) -#ifdef __cplusplus -extern "C" { -#endif - int _etrophy_log_dom = -1; static int _etrophy_init_count = 0; @@ -161,28 +157,28 @@ etrophy_trophy_free(Etrophy_Trophy *trophy) free(trophy); } -EAPI inline const char * +EAPI const char * etrophy_trophy_name_get(const Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN_VAL(trophy, NULL); return trophy->name; } -EAPI inline const char * +EAPI const char * etrophy_trophy_description_get(const Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN_VAL(trophy, NULL); return trophy->description; } -EAPI inline Etrophy_Trophy_Visibility +EAPI Etrophy_Trophy_Visibility etrophy_trophy_visibility_get(const Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN_VAL(trophy, 0); return trophy->visibility; } -EAPI inline void +EAPI void etrophy_trophy_goal_get(const Etrophy_Trophy *trophy, unsigned int *goal, unsigned int *counter) { @@ -191,14 +187,14 @@ etrophy_trophy_goal_get(const Etrophy_Trophy *trophy, unsigned int *goal, if (counter) *counter = trophy->counter; } -EAPI inline unsigned int +EAPI unsigned int etrophy_trophy_points_get(const Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN_VAL(trophy, 0); return trophy->points; } -EAPI inline void +EAPI void etrophy_trophy_counter_set(Etrophy_Trophy *trophy, unsigned int value) { EINA_SAFETY_ON_NULL_RETURN(trophy); @@ -213,7 +209,7 @@ etrophy_trophy_counter_set(Etrophy_Trophy *trophy, unsigned int value) trophy->date = (unsigned int)ecore_time_unix_get(); } -EAPI inline void +EAPI void etrophy_trophy_counter_increment(Etrophy_Trophy *trophy, unsigned int value) { EINA_SAFETY_ON_NULL_RETURN(trophy); @@ -227,14 +223,14 @@ etrophy_trophy_counter_increment(Etrophy_Trophy *trophy, unsigned int value) trophy->date = (unsigned int)ecore_time_unix_get(); } -EAPI inline Eina_Bool +EAPI Eina_Bool etrophy_trophy_earned_get(const Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN_VAL(trophy, EINA_FALSE); return trophy->goal == trophy->counter; } -EAPI inline unsigned int +EAPI unsigned int etrophy_trophy_date_get(const Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN_VAL(trophy, 0); @@ -296,21 +292,21 @@ etrophy_lock_free(Etrophy_Lock *lock) free(lock); } -EAPI inline const char * +EAPI const char * etrophy_lock_name_get(const Etrophy_Lock *lock) { EINA_SAFETY_ON_NULL_RETURN_VAL(lock, NULL); return lock->name; } -EAPI inline Etrophy_Lock_State +EAPI Etrophy_Lock_State etrophy_lock_state_get(const Etrophy_Lock *lock) { EINA_SAFETY_ON_NULL_RETURN_VAL(lock, 0); return lock->state; } -EAPI inline void +EAPI void etrophy_lock_state_set(Etrophy_Lock *lock, Etrophy_Lock_State state) { EINA_SAFETY_ON_NULL_RETURN(lock); @@ -319,7 +315,7 @@ etrophy_lock_state_set(Etrophy_Lock *lock, Etrophy_Lock_State state) lock->date = (unsigned int)ecore_time_unix_get(); } -EAPI inline unsigned int +EAPI unsigned int etrophy_lock_date_get(const Etrophy_Lock *lock) { EINA_SAFETY_ON_NULL_RETURN_VAL(lock, 0); @@ -380,21 +376,21 @@ etrophy_score_free(Etrophy_Score *escore) free(escore); } -EAPI inline const char * +EAPI const char * etrophy_score_player_name_get(const Etrophy_Score *escore) { EINA_SAFETY_ON_NULL_RETURN_VAL(escore, NULL); return escore->player_name; } -EAPI inline int +EAPI int etrophy_score_score_get(const Etrophy_Score *escore) { EINA_SAFETY_ON_NULL_RETURN_VAL(escore, 0); return escore->score; } -EAPI inline unsigned int +EAPI unsigned int etrophy_score_date_get(const Etrophy_Score *escore) { EINA_SAFETY_ON_NULL_RETURN_VAL(escore, 0); @@ -459,7 +455,7 @@ etrophy_level_free(Etrophy_Level *level) free(level); } -EAPI inline const char * +EAPI const char * etrophy_level_name_get(const Etrophy_Level *level) { EINA_SAFETY_ON_NULL_RETURN_VAL(level, NULL); @@ -474,7 +470,7 @@ _score_cmp(const void *data1, const void *data2) return escore2->score - escore1->score; } -EAPI inline void +EAPI void etrophy_level_score_add(Etrophy_Level *level, Etrophy_Score *escore) { EINA_SAFETY_ON_NULL_RETURN(level); @@ -482,7 +478,7 @@ etrophy_level_score_add(Etrophy_Level *level, Etrophy_Score *escore) level->scores = eina_list_sorted_insert(level->scores, _score_cmp, escore); } -EAPI inline void +EAPI void etrophy_level_score_del(Etrophy_Level *level, Etrophy_Score *escore) { EINA_SAFETY_ON_NULL_RETURN(level); @@ -499,7 +495,7 @@ etrophy_level_scores_list_clear(Etrophy_Level *level) etrophy_score_free(data); } -EAPI inline const Eina_List * +EAPI const Eina_List * etrophy_level_scores_list_get(const Etrophy_Level *level) { EINA_SAFETY_ON_NULL_RETURN_VAL(level, NULL); @@ -604,7 +600,7 @@ etrophy_gamescore_free(Etrophy_Gamescore *gamescore) free(gamescore); } -EAPI inline void +EAPI void etrophy_gamescore_level_add(Etrophy_Gamescore *gamescore, Etrophy_Level *level) { EINA_SAFETY_ON_NULL_RETURN(gamescore); @@ -612,7 +608,7 @@ etrophy_gamescore_level_add(Etrophy_Gamescore *gamescore, Etrophy_Level *level) gamescore->levels = eina_list_append(gamescore->levels, level); } -EAPI inline void +EAPI void etrophy_gamescore_level_del(Etrophy_Gamescore *gamescore, Etrophy_Level *level) { EINA_SAFETY_ON_NULL_RETURN(gamescore); @@ -645,14 +641,14 @@ etrophy_gamescore_levels_list_clear(Etrophy_Gamescore *gamescore) etrophy_level_free(data); } -EAPI inline const Eina_List * +EAPI const Eina_List * etrophy_gamescore_levels_list_get(const Etrophy_Gamescore *gamescore) { EINA_SAFETY_ON_NULL_RETURN_VAL(gamescore, NULL); return gamescore->levels; } -EAPI inline void +EAPI void etrophy_gamescore_trophy_add(Etrophy_Gamescore *gamescore, Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN(gamescore); @@ -660,7 +656,7 @@ etrophy_gamescore_trophy_add(Etrophy_Gamescore *gamescore, Etrophy_Trophy *troph gamescore->trophies = eina_list_append(gamescore->trophies, trophy); } -EAPI inline void +EAPI void etrophy_gamescore_trophy_del(Etrophy_Gamescore *gamescore, Etrophy_Trophy *trophy) { EINA_SAFETY_ON_NULL_RETURN(gamescore); @@ -693,14 +689,14 @@ etrophy_gamescore_trophies_list_clear(Etrophy_Gamescore *gamescore) etrophy_trophy_free(data); } -EAPI inline const Eina_List * +EAPI const Eina_List * etrophy_gamescore_trophies_list_get(const Etrophy_Gamescore *gamescore) { EINA_SAFETY_ON_NULL_RETURN_VAL(gamescore, NULL); return gamescore->trophies; } -EAPI inline void +EAPI void etrophy_gamescore_lock_add(Etrophy_Gamescore *gamescore, Etrophy_Lock *lock) { EINA_SAFETY_ON_NULL_RETURN(gamescore); @@ -708,7 +704,7 @@ etrophy_gamescore_lock_add(Etrophy_Gamescore *gamescore, Etrophy_Lock *lock) gamescore->locks = eina_list_append(gamescore->locks, lock); } -EAPI inline void +EAPI void etrophy_gamescore_lock_del(Etrophy_Gamescore *gamescore, Etrophy_Lock *lock) { EINA_SAFETY_ON_NULL_RETURN(gamescore); @@ -750,7 +746,7 @@ etrophy_gamescore_clear(Etrophy_Gamescore *gamescore) etrophy_gamescore_trophies_list_clear(gamescore); } -EAPI inline const Eina_List * +EAPI const Eina_List * etrophy_gamescore_locks_list_get(const Etrophy_Gamescore *gamescore) { EINA_SAFETY_ON_NULL_RETURN_VAL(gamescore, NULL); @@ -839,7 +835,7 @@ etrophy_gamescore_level_score_add(Etrophy_Gamescore *gamescore, const char *leve return escore; } -EAPI inline unsigned int +EAPI unsigned int etrophy_gamescore_trophies_points_get(const Etrophy_Gamescore *gamescore) { unsigned int points = 0; @@ -857,7 +853,7 @@ etrophy_gamescore_trophies_points_get(const Etrophy_Gamescore *gamescore) return points; } -EAPI inline unsigned int +EAPI unsigned int etrophy_gamescore_trophies_total_points_get(const Etrophy_Gamescore *gamescore) { unsigned int points = 0; @@ -1042,7 +1038,3 @@ etrophy_shutdown(void) return _etrophy_init_count; } - -#ifdef __cplusplus -} -#endif diff --git a/src/lib/etrophy_layouts.c b/src/lib/etrophy_layouts.c index 881b8c4..28932d7 100644 --- a/src/lib/etrophy_layouts.c +++ b/src/lib/etrophy_layouts.c @@ -6,10 +6,6 @@ #include "Etrophy.h" -#ifdef __cplusplus -extern "C" { -#endif - static Elm_Genlist_Item_Class itc_group; static Elm_Genlist_Item_Class itc; @@ -148,7 +144,3 @@ etrophy_locks_layout_add(Evas_Object *parent __UNUSED__, Etrophy_Gamescore *game /* TODO */ return NULL; } - -#ifdef __cplusplus -} -#endif --
