aboutsummaryrefslogtreecommitdiff
path: root/xbmc-xrandr.c
diff options
context:
space:
mode:
authormonkeyman_67156 <monkeyman_67156@svn>2009-11-10 02:04:11 +0000
committermonkeyman_67156 <monkeyman_67156@svn>2009-11-10 02:04:11 +0000
commit7521a3ece9bd2b83f156e3adda6fcf69755a4518 (patch)
tree8c70275699f899835ee7af6fcd50b45797ac63d3 /xbmc-xrandr.c
parent854d6a2db3e2e902feac3aaa73caafb1faee494f (diff)
applied: 015_xbmc-xrandr_reassing_symbol_clone-0.1.diff from Ticket #7392. Renamed clone to cloned to prevent symbol collision.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24478 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'xbmc-xrandr.c')
-rw-r--r--xbmc-xrandr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xbmc-xrandr.c b/xbmc-xrandr.c
index 8220bbdaf5..4d24a6651e 100644
--- a/xbmc-xrandr.c
+++ b/xbmc-xrandr.c
@@ -190,7 +190,7 @@ reflection_name (Rotation rotation)
#if HAS_RANDR_1_2
typedef enum _policy {
- clone, extend
+ cloned, extend
} policy_t;
typedef enum _relation {
@@ -1576,7 +1576,7 @@ main (int argc, char **argv)
int ret = 0;
#if HAS_RANDR_1_2
output_t *output = NULL;
- policy_t policy = clone;
+ policy_t policy = cloned;
Bool setit_1_2 = False;
Bool query_1_2 = False;
Bool modeit = False;
@@ -1837,7 +1837,7 @@ main (int argc, char **argv)
continue;
}
if (!strcmp ("--clone", argv[i])) {
- policy = clone;
+ policy = cloned;
setit_1_2 = True;
continue;
}
@@ -2269,9 +2269,9 @@ main (int argc, char **argv)
printf ("\tClones: ");
for (j = 0; j < output_info->nclone; j++)
{
- output_t *clone = find_output_by_xid (output_info->clones[j]);
+ output_t *cloned = find_output_by_xid (output_info->clones[j]);
- if (clone) printf (" %s", clone->output.string);
+ if (cloned) printf (" %s", cloned->output.string);
}
printf ("\n");
if (output->crtc_info)