From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 16 Nov 2009 21:57:10 +0000 (-0500)
Subject: [int] Define MIN/MAX/ABS macros
X-Git-Tag: 2.8.0~23
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6b1fc678ca59df3f3f1ffac0e509cf485c9df0c0;p=fontconfig.git

[int] Define MIN/MAX/ABS macros
---

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index b678f26..c30826e 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -2537,9 +2537,6 @@ FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4,
     return FcFalse;
 }
 
-#define FC_MIN(a,b) ((a) < (b) ? (a) : (b))
-#define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
-#define FC_ABS(a)   ((a) < 0 ? -(a) : (a))
 #define APPROXIMATELY_EQUAL(x,y) (FC_ABS ((x) - (y)) <= FC_MAX (FC_ABS (x), FC_ABS (y)) / 33)
 
 static FcCharSet *
diff --git a/src/fcint.h b/src/fcint.h
index 767a742..81cde21 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -111,6 +111,10 @@
 #define FC_BANK_FIRST 1
 #define FC_BANK_LANGS	    0xfcfcfcfc
 
+#define FC_MIN(a,b) ((a) < (b) ? (a) : (b))
+#define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
+#define FC_ABS(a)   ((a) < 0 ? -(a) : (a))
+
 /* slim_internal.h */
 #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
 #define FcPrivate		__attribute__((__visibility__("hidden")))