summaryrefslogtreecommitdiffstats
path: root/third_party/libpng/pngmem.c
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 14:31:49 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 14:31:49 +0000
commit6386cba6578f9e434a1db539e9e94e695aa69d4f (patch)
treed2c1efaed44d215104e1311d998c27afe1161f82 /third_party/libpng/pngmem.c
parentccc6c392f6b7e0cae9166041fb48cc2d43c1e83e (diff)
downloadchromium_src-6386cba6578f9e434a1db539e9e94e695aa69d4f.zip
chromium_src-6386cba6578f9e434a1db539e9e94e695aa69d4f.tar.gz
chromium_src-6386cba6578f9e434a1db539e9e94e695aa69d4f.tar.bz2
libpng: update to 1.2.45
This is the result of applying the diff from upstream's 1.2.44 -> 1.2.45. I didn't use upstream's provided diff because it's clearly wrong. BUG=89898 TEST=none Review URL: http://codereview.chromium.org/7464050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/pngmem.c')
-rw-r--r--third_party/libpng/pngmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/libpng/pngmem.c b/third_party/libpng/pngmem.c
index 91f2765..a18719b 100644
--- a/third_party/libpng/pngmem.c
+++ b/third_party/libpng/pngmem.c
@@ -442,7 +442,7 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
* have the ability to do that.
*/
-png_voidp PNGAPI
+png_voidp /* PRIVATE */
png_calloc(png_structp png_ptr, png_uint_32 size)
{
png_voidp ret;