summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2013-03-20 16:06:31 +0000
committerTaco Hoekwater <taco@elvenkind.com>2013-03-20 16:06:31 +0000
commitf0651fc0686347b0ef6b92fedaae0594c9669696 (patch)
treec45df50da412f0629c8765b6940e8a5e655531a1 /Build
parentcfda34b0f42ecfdb81d20323747c36392154f7dc (diff)
add a small patch for portability to Solaris 9 (undefined SIZE_MAX)
git-svn-id: svn://tug.org/texlive/trunk@29442 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog6
-rw-r--r--Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes2
-rw-r--r--Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max13
-rw-r--r--Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c2
4 files changed, 22 insertions, 1 deletions
diff --git a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog
index ca5b18c6699..96d4fa3bdaa 100644
--- a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog
+++ b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-20 Taco Hoekwater <taco@metatex.org>
+
+ Created and applied patch-01-size_max for portability
+ to Solaris 9.
+
2012-11-10 Taco Hoekwater <taco@metatex.org>
Import pixman-0.28.0
+
diff --git a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes
index 595816d643a..54032d4da77 100644
--- a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes
+++ b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes
@@ -18,3 +18,5 @@ Removed unused dirs:
demos
test
+Applied patch:
+ patch-01-size_max
diff --git a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max
new file mode 100644
index 00000000000..7aa6b403f39
--- /dev/null
+++ b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max
@@ -0,0 +1,13 @@
+diff -u pixman-0.28.0.orig/pixman/pixman-utils.c pixman-0.28.0/pixman/pixman-utils.c
+===================================================================
+--- pixman-0.28.0.orig/pixman/pixman-utils.c
++++ pixman-0.28.0/pixman/pixman-utils.c
+@@ -33,7 +33,7 @@
+ pixman_bool_t
+ _pixman_multiply_overflows_size (size_t a, size_t b)
+ {
+- return a >= SIZE_MAX / b;
++ return a >= ((size_t)-1) / b;
+ }
+
+ pixman_bool_t
diff --git a/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c b/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c
index b1e9fb62db2..5ecbede4b47 100644
--- a/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c
+++ b/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c
@@ -33,7 +33,7 @@
pixman_bool_t
_pixman_multiply_overflows_size (size_t a, size_t b)
{
- return a >= SIZE_MAX / b;
+ return a >= ((size_t)-1) / b;
}
pixman_bool_t