[EGIT] [core/enlightenment] master 09/24: move x11 randr defines to e_comp_x_randr.c

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=449f12e62fc1c84aef48c2990ce66cba680e4da3

commit 449f12e62fc1c84aef48c2990ce66cba680e4da3
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Jul 21 16:20:03 2017 -0400

    move x11 randr defines to e_comp_x_randr.c
---
 src/bin/e_comp_x_randr.c | 10 ++++++++--
 src/bin/e_randr2.h       |  5 -----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
index ee80856e8..3e793c717 100644
--- a/src/bin/e_comp_x_randr.c
+++ b/src/bin/e_comp_x_randr.c
@@ -1,6 +1,12 @@
 #include "e.h"
 #include <Ecore_X.h>
 
+
+#define RANDR_VERSION_1_1 ((1 << 16) | 1)
+#define RANDR_VERSION_1_2 ((1 << 16) | 2)
+#define RANDR_VERSION_1_3 ((1 << 16) | 3)
+#define RANDR_VERSION_1_4 ((1 << 16) | 4)
+
 static char *_output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
 static Ecore_X_Randr_Edid_Display_Interface_Type 
_output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
 static char *_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
@@ -436,7 +442,7 @@ e_comp_x_randr_init(void)
    E_LIST_HANDLER_APPEND(handlers, ECORE_X_EVENT_RANDR_OUTPUT_CHANGE,
                          _cb_output_change, NULL);
    // if it's 1.2 or better then we can select for these events
-   if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2)
+   if (ecore_x_randr_version_get() >= RANDR_VERSION_1_2)
      {
         Ecore_X_Window root = ecore_x_window_root_first_get();
         ecore_x_randr_events_select(root, EINA_TRUE);
@@ -447,7 +453,7 @@ E_API void
 e_comp_x_randr_shutdown(void)
 {
    // clear up event listening
-   if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2)
+   if (ecore_x_randr_version_get() >= RANDR_VERSION_1_2)
      {
         Ecore_X_Window root = ecore_x_window_root_first_get();
         ecore_x_randr_events_select(root, EINA_FALSE);
diff --git a/src/bin/e_randr2.h b/src/bin/e_randr2.h
index 549c32924..e964bb7eb 100644
--- a/src/bin/e_randr2.h
+++ b/src/bin/e_randr2.h
@@ -11,11 +11,6 @@ typedef struct _E_Config_Randr2_Screen 
E_Config_Randr2_Screen;
 #ifndef E_RANDR2_H
 #define E_RAND2R_H
 
-#define E_RANDR_VERSION_1_1 ((1 << 16) | 1)
-#define E_RANDR_VERSION_1_2 ((1 << 16) | 2)
-#define E_RANDR_VERSION_1_3 ((1 << 16) | 3)
-#define E_RANDR_VERSION_1_4 ((1 << 16) | 4)
-
 typedef enum _E_Randr2_Relative
 {
    E_RANDR2_RELATIVE_UNKNOWN,

--