diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-05 10:51:33 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-05 10:51:33 +0000 |
| commit | 1cb09e658a245596b48586ecccbe4549076947c8 (patch) | |
| tree | c17868aaf2dc74e45e10d56cfef6107f8e90b48a /patches | |
| parent | ca258a38f902c3b3af92eec5b15abfd222d890b8 (diff) | |
| download | ptxdist-1cb09e658a245596b48586ecccbe4549076947c8.tar.gz ptxdist-1cb09e658a245596b48586ecccbe4549076947c8.tar.xz | |
* fbutils: unbroke for gcc 4.2
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6733 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/fbutils-20041102-1/generic/fbutils-20041102-1-defect-maxmin.diff | 58 | ||||
| -rw-r--r-- | patches/fbutils-20041102-1/generic/series | 3 |
2 files changed, 61 insertions, 0 deletions
diff --git a/patches/fbutils-20041102-1/generic/fbutils-20041102-1-defect-maxmin.diff b/patches/fbutils-20041102-1/generic/fbutils-20041102-1-defect-maxmin.diff new file mode 100644 index 000000000..b25cb94e7 --- /dev/null +++ b/patches/fbutils-20041102-1/generic/fbutils-20041102-1-defect-maxmin.diff @@ -0,0 +1,58 @@ +# +# Submitted-By: Robert Schwebel, 2007-01-05 +# Committed-By: Robert Schwebel +# +# Error: +# +# make[2]: Entering directory `.../fbutils-20041102-1/fbcmap' +# arm-v4t-linux-gnueabi-g++ -Wall -I../include -O2 -M -E *.C > .depend +# arm-v4t-linux-gnueabi-g++ -Wall -I../include -O2 -c fbcmap.C -o fbcmap.o +# fbcmap.C: In function 'int main(int, char**)': +# fbcmap.C:118: error: expected primary-expression before '?' token +# +# Description: +# +# Seems like the GNU extension ">?" for MAX isn't supported any more +# +# State: +# +# no idea where to find upstream +# + +diff -urN fbutils-20041102-1/fbcmap/fbcmap.C fbutils-20041102-1-ptx1/fbcmap/fbcmap.C +--- fbutils-20041102-1/fbcmap/fbcmap.C 2007-01-05 11:47:22.000000000 +0100 ++++ fbutils-20041102-1-ptx1/fbcmap/fbcmap.C 2007-01-05 11:45:07.000000000 +0100 +@@ -13,6 +13,12 @@ + #include "framebuffer.h" + #include "util.h" + ++#ifndef MAX ++#define MAX(a, b) ((a > b) ? a : b) ++#endif ++#ifndef MIN ++#define MIN(a, b) ((a < b) ? a : b) ++#endif + + bool Opt_version = false; + bool Opt_verbose = false; +@@ -115,8 +121,9 @@ + break; + + case FB_VISUAL_DIRECTCOLOR: +- numcolorcells = 1<<(var.red.length >? var.green.length >? +- var.blue.length); ++// numcolorcells = 1<<(var.red.length >? var.green.length >? ++// var.blue.length); ++ numcolorcells = 1<<(MAX(MAX(var.red.length,var.green.length),var.blue.length)); + break; + + case FB_VISUAL_PSEUDOCOLOR: +@@ -145,7 +152,7 @@ + } + cmap.Set(fb); + } else if (!strcmp(Opt_command, "vga")) { +- u_int len = cmap.len <? 16; ++ u_int len = MIN(cmap.len,16); + memcpy(cmap.red, VGA_Red, len*sizeof(*cmap.red)); + memcpy(cmap.green, VGA_Green, len*sizeof(*cmap.green)); + memcpy(cmap.blue, VGA_Blue, len*sizeof(*cmap.blue)); diff --git a/patches/fbutils-20041102-1/generic/series b/patches/fbutils-20041102-1/generic/series new file mode 100644 index 000000000..91e5a031a --- /dev/null +++ b/patches/fbutils-20041102-1/generic/series @@ -0,0 +1,3 @@ +fbutils-20041102-1-installfix.diff +fbutils-20041102-1-ptx1.diff +fbutils-20041102-1-defect-maxmin.diff |