--- a/galerautils/src/gu_alloc.cpp +++ b/galerautils/src/gu_alloc.cpp @@ -29,10 +29,11 @@ if (gu_likely(size <= left_)) { /* to avoid too frequent allocation, make it (at least) 64K */ - static page_size_type const PAGE_SIZE(gu_page_size_multiple(1 << 16)); + /* was PAGE_SIZE but collided with a define */ + static page_size_type const PG_SZ(gu_page_size_multiple(1 << 16)); page_size_type const page_size - (std::min(std::max(size, PAGE_SIZE), left_)); + (std::min(std::max(size, PG_SZ), left_)); Page* ret = new HeapPage (page_size);