From 5bbedc3013d0182e06ec7204e12aa32a2ea97407 Mon Sep 17 00:00:00 2001
From: Chris Michael <cp.michael@samsung.com>
Date: Wed, 25 Jun 2014 09:42:07 -0400
Subject: [PATCH] cpufreq: Fix duplicate structure name when including EGL
 headers

When we include support (in the wayland compositor) for compiling with
EGL, the inclusion of the EGL headers cause a conflict with the
Status structure name in this module, so lets rename it.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
---
 src/modules/cpufreq/e_mod_main.c | 20 ++++++++++----------
 src/modules/cpufreq/e_mod_main.h |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index 10a5b1d78..46c4d9c50 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -40,10 +40,10 @@ static void      _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, vo
 static void      _menu_cb_post(void *data, E_Menu *m);
 static void      _cpufreq_set_frequency(int frequency);
 static Eina_Bool _cpufreq_cb_check(void *data);
-static Status   *_cpufreq_status_new(void);
-static void      _cpufreq_status_free(Status *s);
-static void      _cpufreq_status_check_available(Status *s);
-static int       _cpufreq_status_check_current(Status *s);
+static Cpu_Status *_cpufreq_status_new(void);
+static void      _cpufreq_status_free(Cpu_Status *s);
+static void      _cpufreq_status_check_available(Cpu_Status *s);
+static int       _cpufreq_status_check_current(Cpu_Status *s);
 static int       _cpufreq_cb_sort(const void *item1, const void *item2);
 static void      _cpufreq_face_update_available(Instance *inst);
 static void      _cpufreq_face_update_current(Instance *inst);
@@ -622,19 +622,19 @@ _cpufreq_cb_check(void *data __UNUSED__)
    return ECORE_CALLBACK_RENEW;
 }
 
-static Status *
+static Cpu_Status *
 _cpufreq_status_new(void)
 {
-   Status *s;
+   Cpu_Status *s;
 
-   s = E_NEW(Status, 1);
+   s = E_NEW(Cpu_Status, 1);
    if (!s) return NULL;
    s->active = -1;
    return s;
 }
 
 static void
-_cpufreq_status_free(Status *s)
+_cpufreq_status_free(Cpu_Status *s)
 {
    Eina_List *l;
 
@@ -664,7 +664,7 @@ _cpufreq_cb_sort(const void *item1, const void *item2)
 }
 
 static void
-_cpufreq_status_check_available(Status *s)
+_cpufreq_status_check_available(Cpu_Status *s)
 {
    char buf[4096];
    Eina_List *l;
@@ -816,7 +816,7 @@ _cpufreq_status_check_available(Status *s)
 }
 
 static int
-_cpufreq_status_check_current(Status *s)
+_cpufreq_status_check_current(Cpu_Status *s)
 {
    int ret = 0;
    int frequency = 0;
diff --git a/src/modules/cpufreq/e_mod_main.h b/src/modules/cpufreq/e_mod_main.h
index c701f6b5f..c57e01fd5 100644
--- a/src/modules/cpufreq/e_mod_main.h
+++ b/src/modules/cpufreq/e_mod_main.h
@@ -1,12 +1,12 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-typedef struct _Status       Status;
+typedef struct _Cpu_Status       Cpu_Status;
 typedef struct _Config       Config;
 
 #define CPUFREQ_CONFIG_VERSION 1
 
-struct _Status
+struct _Cpu_Status
 {
    Eina_List     *frequencies;
    Eina_List     *governors;
@@ -47,7 +47,7 @@ struct _Config
    E_Menu       *menu_powersave;
    E_Menu       *menu_pstate1;
    E_Menu       *menu_pstate2;
-   Status       *status;
+   Cpu_Status   *status;
    char         *set_exe_path;
    Ecore_Poller *frequency_check_poller;
    Ecore_Event_Handler *handler;