aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-31 13:04:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-31 13:04:32 +0000
commit7acebabfedea522f08376096754800570f2c28e2 (patch)
tree8ff119c270b22d6f75166375d97b911111ee2b49
parentb5e7fb4c103b3898cb78e9f7615cf7893626a5e9 (diff)
parent98b7535d85203c12a1989a66e958baf9dbc475c4 (diff)
downloadandroid_external_libpng-7acebabfedea522f08376096754800570f2c28e2.tar.gz
android_external_libpng-7acebabfedea522f08376096754800570f2c28e2.tar.bz2
android_external_libpng-7acebabfedea522f08376096754800570f2c28e2.zip
Merge "Make png_uint_32 32 bits wide on all platforms."
-rw-r--r--pngconf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/pngconf.h b/pngconf.h
index 219b42e..d0dc20c 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1236,8 +1236,8 @@
* want to have unsigned int for png_uint_32 instead of unsigned long.
*/
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
+typedef unsigned int png_uint_32;
+typedef int png_int_32;
typedef unsigned short png_uint_16;
typedef short png_int_16;
typedef unsigned char png_byte;