From b0f220b7f236b5dea30ddc5dec51b73c11120e10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 29 Jun 2009 11:21:33 -0400 Subject: [PATCH] Inlucde pixman-private.h in pixman-region.c Delete some duplicated macros. --- pixman/pixman-region.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c index d448266..59b8ac2 100644 --- a/pixman/pixman-region.c +++ b/pixman/pixman-region.c @@ -49,6 +49,7 @@ SOFTWARE. #include #include #include +#include "pixman-private.h" #define PIXREGION_NIL(reg) ((reg)->data && !(reg)->data->numRects) /* not a region */ @@ -63,22 +64,8 @@ SOFTWARE. #define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->numRects - 1) -#undef assert -#ifdef DEBUG_PIXREGION -#define assert(expr) {if (!(expr)) \ - FatalError("Assertion failed file %s, line %d: expr\n", \ - __FILE__, __LINE__); } -#else -#define assert(expr) -#endif - #define good(reg) assert(PREFIX(_selfcheck) (reg)) -#undef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#undef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) - static const box_type_t PREFIX(_emptyBox_) = {0, 0, 0, 0}; static const region_data_type_t PREFIX(_emptyData_) = {0, 0}; static const region_data_type_t PREFIX(_brokendata_) = {0, 0}; -- 2.7.4