[cairo-commit] libpixman/src icint.h,1.17,1.18 pixman.h,1.9,1.10 pixregion.c,1.7,1.8 slim_export.h,1.1,NONE slim_import.h,1.1,NONE

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/libpixman/src
In directory pdx:/tmp/cvs-serv5981/src

Modified Files:
	icint.h pixman.h pixregion.c 
Removed Files:
	slim_export.h slim_import.h 
Log Message:

        * src/pixman.h: Fold contents of slim_export/import.h directly
        into this file to avoid dependence on external slim package.

        * src/icint.h:
        * src/pixregionint.h: Use quote-based include now that
        slim_internal is an internal file.

        * src/icint.h: Follow convention of other files for
        multi-inclusion guard (_IC_INT_H_)


        * configure.in: Remove cruft.



Index: icint.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icint.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** icint.h	10 Dec 2003 23:23:43 -0000	1.17
--- icint.h	12 Dec 2003 18:47:59 -0000	1.18
***************
*** 21,26 ****
   */
  
! #ifndef ICINT_H_INCLUDED
! #define ICINT_H_INCLUDED
  
  #include "pixman.h"
--- 21,26 ----
   */
  
! #ifndef _ICINT_H_
! #define _ICINT_H_
  
  #include "pixman.h"
***************
*** 32,36 ****
  
  
! #include <slim_internal.h>
  
  
--- 32,36 ----
  
  
! #include "slim_internal.h"
  
  
***************
*** 1018,1020 ****
  #endif /* _PICTURE_H_ */
  
! #endif /* ICINT_H_INCLUDED */
--- 1018,1020 ----
  #endif /* _PICTURE_H_ */
  
! #endif /* _ICINT_H_ */

Index: pixman.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixman.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pixman.h	10 Dec 2003 23:40:15 -0000	1.9
--- pixman.h	12 Dec 2003 18:47:59 -0000	1.10
***************
*** 93,100 ****
  
  
! #if defined(_PIXREGIONINT_H_) || defined(_ICINT_H_)
! #include <slim_export.h>
  #else
! #include <slim_import.h>
  #endif
  
--- 93,105 ----
  
  
! /* From slim_export.h and slim_import.h */
! #if defined(WIN32) || defined(__CYGWIN__)
! # if defined(_PIXREGIONINT_H_) || defined(_ICINT_H_)
! #  define __external_linkage	__declspec(dllexport)
! # else
! #  define __external_linkage	__declspec(dllimport)
! # endif
  #else
! # define __external_linkage
  #endif
  

Index: pixregion.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixregion.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pixregion.c	10 Dec 2003 23:40:23 -0000	1.7
--- pixregion.c	12 Dec 2003 18:47:59 -0000	1.8
***************
*** 52,56 ****
  
  #include "pixregionint.h"
! #include <slim_internal.h>
  
  #if defined (__GNUC__) && !defined (NO_INLINES)
--- 52,56 ----
  
  #include "pixregionint.h"
! #include "slim_internal.h"
  
  #if defined (__GNUC__) && !defined (NO_INLINES)

--- slim_export.h DELETED ---

--- slim_import.h DELETED ---