diff options
author | Fabian Affolter <fabian@bernewireless.net> | 2011-07-05 19:40:43 +0200 |
---|---|---|
committer | Fabian Affolter <fabian@bernewireless.net> | 2011-07-05 19:40:43 +0200 |
commit | 7f9851115264bca9bce3926ddb29e533a23929dd (patch) | |
tree | b0426fc489e4dad582f34b25d6f93354a65f5c0f /main/xrandr/xrandr-1.3.0-clone-nameclash.patch | |
parent | 5dac3f219058736f6e19b7bec2b1cc2b1b300981 (diff) | |
parent | 269fc1049583d36e07153215fe535f88947ea98b (diff) | |
download | aports-7f9851115264bca9bce3926ddb29e533a23929dd.tar.bz2 aports-7f9851115264bca9bce3926ddb29e533a23929dd.tar.xz |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/xrandr/xrandr-1.3.0-clone-nameclash.patch')
-rw-r--r-- | main/xrandr/xrandr-1.3.0-clone-nameclash.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/main/xrandr/xrandr-1.3.0-clone-nameclash.patch b/main/xrandr/xrandr-1.3.0-clone-nameclash.patch new file mode 100644 index 0000000000..55af5590c4 --- /dev/null +++ b/main/xrandr/xrandr-1.3.0-clone-nameclash.patch @@ -0,0 +1,29 @@ +--- xrandr-1.3.0/xrandr.c.orig 2009-04-10 12:26:02.000000000 +0000 ++++ xrandr-1.3.0/xrandr.c 2009-04-10 12:43:44.000000000 +0000 +@@ -209,7 +209,7 @@ + + #if HAS_RANDR_1_2 + typedef enum _policy { +- clone, extend ++ p_clone, extend + } policy_t; + + typedef enum _relation { +@@ -2027,7 +2027,7 @@ + int ret = 0; + #if HAS_RANDR_1_2 + output_t *output = NULL; +- policy_t policy = clone; ++ policy_t policy = p_clone; + Bool setit_1_2 = False; + Bool query_1_2 = False; + Bool modeit = False; +@@ -2401,7 +2401,7 @@ + continue; + } + if (!strcmp ("--clone", argv[i])) { +- policy = clone; ++ policy = p_clone; + setit_1_2 = True; + continue; + } |