[cairo-commit] libpixman/src icint.h,1.27,1.28 ictrap.c,1.19,1.20

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv12587/src

Modified Files:
	icint.h ictrap.c 
Log Message:

        * src/icint.h:
        * src/ictrap.c: Move definitions of MIN and MAX macros from
        ictrap.c to icint.h.


Index: icint.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icint.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- icint.h	2 Mar 2005 15:43:33 -0000	1.27
+++ icint.h	3 Mar 2005 21:52:49 -0000	1.28
@@ -39,6 +39,9 @@
 #define __inline
 #endif
 
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+
 /* C89 has implementation-defined behavior for % with negative operands.
    C99 has well-defined behavior which is that / with integers rounds toward zero
        and a%b is defined so that (a/b)*b + a%b == a.

Index: ictrap.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ictrap.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ictrap.c	3 Mar 2005 21:47:04 -0000	1.19
+++ ictrap.c	3 Mar 2005 21:52:49 -0000	1.20
@@ -24,9 +24,6 @@
 
 #include "icint.h"
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
 pixman_image_t *
 IcCreateAlphaPicture (pixman_image_t	*dst,
 		      pixman_format_t	*format,