summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2016-08-29 10:35:21 +0200
committerJean Guyomarc'h <jean@guyomarch.bzh>2016-08-29 20:03:52 +0200
commit9a82b17effacc24e289a4ad09c8bc850f0b16a9a (patch)
treefeaf02a95ab1c1fbfb15a90141efdb674a9c31e9
parent82808e20802f2fbac4043d2cdca1bf2671a42240 (diff)
evas: don't redefine PAGE_SIZE if already defined
On OSX, we include mach.h (via the inlined locks API), which already defines PAGE_SIZE.
-rw-r--r--src/lib/evas/common/evas_image_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c
index 1b0a7d5cc0..b0023c399c 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -115,7 +115,9 @@ _evas_common_rgba_image_surface_size(unsigned int w, unsigned int h,
115 Evas_Colorspace cspace, 115 Evas_Colorspace cspace,
116 /* inout */ int *l, int *r, int *t, int *b) 116 /* inout */ int *l, int *r, int *t, int *b)
117{ 117{
118#define PAGE_SIZE (4 * 1024) 118#ifndef PAGE_SIZE
119# define PAGE_SIZE (4 * 1024)
120#endif
119#define HUGE_PAGE_SIZE (2 * 1024 * 1024) 121#define HUGE_PAGE_SIZE (2 * 1024 * 1024)
120#if defined (HAVE_SYS_MMAN_H) && (!defined (_WIN32)) 122#if defined (HAVE_SYS_MMAN_H) && (!defined (_WIN32))
121# define ALIGN_TO_PAGE(Siz) (((Siz / PAGE_SIZE) + (Siz % PAGE_SIZE ? 1 : 0)) * PAGE_SIZE) 123# define ALIGN_TO_PAGE(Siz) (((Siz / PAGE_SIZE) + (Siz % PAGE_SIZE ? 1 : 0)) * PAGE_SIZE)