princeamd pushed a commit to branch ecore-1.7.
commit 27cd63650ce7ef98934cdb51df1c94db25d0ffc3
Author: Chris Michael <[email protected]>
Date: Thu Aug 1 15:18:01 2013 +0100
Backport: aa75297 : Add #ifdef ECORE_XRANDR around the edid functions.
NB: Cannot really happen for 1.8 (as --disable-ecore-x-randr has no
effect), but really these should have been ifdef'd from the start.
NB: IMO, Don't think a ChangeLog is really needed for this....
Signed-off-by: Chris Michael <[email protected]>
Signed-off-by: Deon Thomas <[email protected]>
---
src/lib/ecore_x/xlib/ecore_x_randr.c | 60 +++++++++++++++++++++++++++++++-----
1 file changed, 52 insertions(+), 8 deletions(-)
diff --git a/src/lib/ecore_x/xlib/ecore_x_randr.c
b/src/lib/ecore_x/xlib/ecore_x_randr.c
index 1ccb5e5..9d80ac0 100644
--- a/src/lib/ecore_x/xlib/ecore_x_randr.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr.c
@@ -3374,6 +3374,7 @@ ecore_x_randr_edid_has_valid_header(unsigned char *edid,
unsigned long edid_leng
EAPI Eina_Bool
ecore_x_randr_edid_info_has_valid_checksum(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
unsigned char *iter = NULL;
char sum = 0;
int i = 0, version = 0;
@@ -3400,11 +3401,15 @@ ecore_x_randr_edid_info_has_valid_checksum(unsigned
char *edid, unsigned long ed
if (sum) return EINA_FALSE;
return EINA_TRUE;
+#else
+ return EINA_FALSE;
+#endif
}
EAPI int
ecore_x_randr_edid_version_get(unsigned char *edid, unsigned long edid_length)
{
+#ifdef ECORE_XRANDR
if ((edid_length > RANDR_EDID_VERSION_MINOR) &&
(ecore_x_randr_edid_has_valid_header(edid, edid_length)))
{
@@ -3413,11 +3418,15 @@ ecore_x_randr_edid_version_get(unsigned char *edid,
unsigned long edid_length)
}
return ECORE_X_RANDR_EDID_UNKNOWN_VALUE;
+#else
+ return 0;
+#endif
}
EAPI char *
ecore_x_randr_edid_manufacturer_name_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
if ((edid_length > RANDR_EDID_MANUFACTURER + 1) &&
(ecore_x_randr_edid_has_valid_header(edid, edid_length)))
{
@@ -3434,13 +3443,14 @@ ecore_x_randr_edid_manufacturer_name_get(unsigned char
*edid, unsigned long edid
return name;
}
-
+#endif
return NULL;
}
EAPI char *
ecore_x_randr_edid_display_name_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
unsigned char *block = NULL;
int version = 0;
@@ -3469,13 +3479,14 @@ ecore_x_randr_edid_display_name_get(unsigned char
*edid, unsigned long edid_leng
}
}
}
-
+#endif
return NULL;
}
EAPI char *
ecore_x_randr_edid_display_ascii_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
unsigned char *block = NULL;
int version = 0;
@@ -3504,13 +3515,14 @@ ecore_x_randr_edid_display_ascii_get(unsigned char
*edid, unsigned long edid_len
}
}
}
-
+#endif
return NULL;
}
EAPI char *
ecore_x_randr_edid_display_serial_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
unsigned char *block = NULL;
int version = 0;
@@ -3539,7 +3551,7 @@ ecore_x_randr_edid_display_serial_get(unsigned char
*edid, unsigned long edid_le
}
}
}
-
+#endif
return NULL;
}
@@ -3552,77 +3564,90 @@ ecore_x_randr_edid_model_get(unsigned char *edid,
unsigned long edid_length)
EAPI int
ecore_x_randr_edid_manufacturer_serial_number_get(unsigned char *edid,
unsigned long edid_length)
{
+#ifdef ECORE_XRANDR
if ((edid_length > RANDR_EDID_MANUFACTURER + 1) &&
(ecore_x_randr_edid_has_valid_header(edid, edid_length)))
return (int)(edid[0x0c] + (edid[0x0d] << 8) +
(edid[0x0e] << 16) + (edid[0x0f] << 24));
return ECORE_X_RANDR_EDID_UNKNOWN_VALUE;
+#else
+ return 0;
+#endif
}
EAPI int
ecore_x_randr_edid_manufacturer_model_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
if ((edid_length > RANDR_EDID_MANUFACTURER + 1) &&
(ecore_x_randr_edid_has_valid_header(edid, edid_length)))
return (int)(edid[0x0a] + (edid[0x0b] << 8));
-
+#endif
return ECORE_X_RANDR_EDID_UNKNOWN_VALUE;
}
EAPI Eina_Bool
ecore_x_randr_edid_dpms_available_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
int version = 0;
version = ecore_x_randr_edid_version_get(edid, edid_length);
if (version < RANDR_EDID_VERSION_1_3) return EINA_FALSE;
return !!(edid[0x18] & 0xE0);
+#else
+ return EINA_FALSE;
+#endif
}
EAPI Eina_Bool
ecore_x_randr_edid_dpms_standby_available_get(unsigned char *edid, unsigned
long edid_length)
{
+#ifdef ECORE_XRANDR
int version = 0;
version = ecore_x_randr_edid_version_get(edid, edid_length);
if (version < RANDR_EDID_VERSION_1_3) return EINA_FALSE;
if (edid[0x18] & 0xE0) return !!(edid[0x18] & 0x80);
-
+#endif
return EINA_FALSE;
}
EAPI Eina_Bool
ecore_x_randr_edid_dpms_suspend_available_get(unsigned char *edid, unsigned
long edid_length)
{
+#ifdef ECORE_XRANDR
int version = 0;
version = ecore_x_randr_edid_version_get(edid, edid_length);
if (version < RANDR_EDID_VERSION_1_3) return EINA_FALSE;
if (edid[0x18] & 0xE0) return !!(edid[0x18] & 0x40);
-
+#endif
return EINA_FALSE;
}
EAPI Eina_Bool
ecore_x_randr_edid_dpms_off_available_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
int version = 0;
version = ecore_x_randr_edid_version_get(edid, edid_length);
if (version < RANDR_EDID_VERSION_1_3) return EINA_FALSE;
if (edid[0x18] & 0xE0) return !!(edid[0x18] & 0x20);
-
+#endif
return EINA_FALSE;
}
EAPI Ecore_X_Randr_Edid_Aspect_Ratio
ecore_x_randr_edid_display_aspect_ratio_preferred_get(unsigned char *edid,
unsigned long edid_length)
{
+#ifdef ECORE_XRANDR
unsigned char *block = NULL;
int version = 0;
@@ -3660,11 +3685,15 @@
ecore_x_randr_edid_display_aspect_ratio_preferred_get(unsigned char *edid, unsig
}
return ECORE_X_RANDR_EDID_UNKNOWN_VALUE;
+#else
+ return 0;
+#endif
}
EAPI Ecore_X_Randr_Edid_Aspect_Ratio
ecore_x_randr_edid_display_aspect_ratios_get(unsigned char *edid, unsigned
long edid_length)
{
+#ifdef ECORE_XRANDR
Ecore_X_Randr_Edid_Aspect_Ratio ret;
unsigned char *block = NULL;
int version = 0;
@@ -3697,11 +3726,15 @@ ecore_x_randr_edid_display_aspect_ratios_get(unsigned
char *edid, unsigned long
}
return ret;
+#else
+ return 0;
+#endif
}
EAPI Ecore_X_Randr_Edid_Display_Colorscheme
ecore_x_randr_edid_display_colorscheme_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
Ecore_X_Randr_Edid_Display_Colorscheme ret;
int version = 0;
@@ -3723,22 +3756,30 @@ ecore_x_randr_edid_display_colorscheme_get(unsigned
char *edid, unsigned long ed
ret = (edid[0x18] & 0x18);
return ret;
+#else
+ return 0;
+#endif
}
EAPI Eina_Bool
ecore_x_randr_edid_display_type_digital_get(unsigned char *edid, unsigned long
edid_length)
{
+#ifdef ECORE_XRANDR
int version = 0;
version = ecore_x_randr_edid_version_get(edid, edid_length);
if (version < RANDR_EDID_VERSION_1_3) return EINA_FALSE;
return !!(edid[0x14] & 0x80);
+#else
+ return EINA_FALSE;
+#endif
}
EAPI Ecore_X_Randr_Edid_Display_Interface_Type
ecore_x_randr_edid_display_interface_type_get(unsigned char *edid, unsigned
long edid_length)
{
+#ifdef ECORE_XRANDR
Ecore_X_Randr_Edid_Display_Interface_Type type;
int version = 0;
@@ -3753,4 +3794,7 @@ ecore_x_randr_edid_display_interface_type_get(unsigned
char *edid, unsigned long
type = ECORE_X_RANDR_EDID_UNKNOWN_VALUE;
return type;
+#else
+ return 0;
+#endif
}
--
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
