[cairo-commit] libpixman/src ic.c,1.17,1.18 icint.h,1.25,1.26

[Carl Worth]

Committed by: cworth

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

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

        * src/ic.c:
        * src/icint.h: Move definition of __inline for non-gcc from ic.c
        to icint.h so it applies to more code in the implementation.


Index: ic.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ic.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ic.c	4 Jan 2005 19:55:36 -0000	1.17
+++ ic.c	21 Feb 2005 20:57:27 -0000	1.18
@@ -23,11 +23,6 @@
 
 #include "icint.h"
 
-#ifndef __GNUC__
-#define __inline
-#endif
-
-
 #define cvt8888to0565(s)    ((((s) >> 3) & 0x001f) | \
 			     (((s) >> 5) & 0x07e0) | \
 			     (((s) >> 8) & 0xf800))

Index: icint.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icint.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- icint.h	21 Jan 2005 18:26:28 -0000	1.25
+++ icint.h	21 Feb 2005 20:57:27 -0000	1.26
@@ -33,10 +33,12 @@
 #include <string.h>
 #include <limits.h>
 
-
-
 #include "slim_internal.h"
 
+#ifndef __GNUC__
+#define __inline
+#endif
+
 /* 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.