From 9a82b17effacc24e289a4ad09c8bc850f0b16a9a Mon Sep 17 00:00:00 2001 From: Jean Guyomarc'h Date: Mon, 29 Aug 2016 10:35:21 +0200 Subject: [PATCH] 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. --- src/lib/evas/common/evas_image_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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, Evas_Colorspace cspace, /* inout */ int *l, int *r, int *t, int *b) { -#define PAGE_SIZE (4 * 1024) +#ifndef PAGE_SIZE +# define PAGE_SIZE (4 * 1024) +#endif #define HUGE_PAGE_SIZE (2 * 1024 * 1024) #if defined (HAVE_SYS_MMAN_H) && (!defined (_WIN32)) # define ALIGN_TO_PAGE(Siz) (((Siz / PAGE_SIZE) + (Siz % PAGE_SIZE ? 1 : 0)) * PAGE_SIZE)