diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 20:58:36 +0000 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 20:58:36 +0000 |
commit | ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14 (patch) | |
tree | 55a1e7c2bf2007f88cc5518052419bee63126688 /gfx/cairo/libpixman/src/pixman.h | |
parent | 9ffed6e8bfb35c090caf5f8bca7a0f8bd4cbec94 (diff) | |
parent | 1d7664d3a1db098024c7624650b0d272a26635e0 (diff) | |
download | UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.gz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.lz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.xz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.zip |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
# old-configure.in
Diffstat (limited to 'gfx/cairo/libpixman/src/pixman.h')
-rw-r--r-- | gfx/cairo/libpixman/src/pixman.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gfx/cairo/libpixman/src/pixman.h b/gfx/cairo/libpixman/src/pixman.h index 1cbf62e21..23408b028 100644 --- a/gfx/cairo/libpixman/src/pixman.h +++ b/gfx/cairo/libpixman/src/pixman.h @@ -104,8 +104,6 @@ typedef __int32 int32_t; typedef unsigned __int32 uint32_t; typedef __int64 int64_t; typedef unsigned __int64 uint64_t; -#elif defined (_AIX) -# include <sys/inttypes.h> #else # include <stdint.h> #endif |