[cairo-commit] libpixman/src pixregion.c,1.6,1.7

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	pixregion.c 
Log Message:
Correct some more renames where the order of the renaming
caused later renames to fail due to earlier prefixes failing.


Index: pixregion.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixregion.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pixregion.c	10 Dec 2003 23:24:26 -0000	1.6
--- pixregion.c	10 Dec 2003 23:40:23 -0000	1.7
***************
*** 89,93 ****
  pixman_uninit (pixman_region16_t *region);
  
! slim_hidden_proto(pixman_region_createSimple)
  slim_hidden_proto(pixman_region_copy)
  slim_hidden_proto(pixman_region_union)
--- 89,93 ----
  pixman_uninit (pixman_region16_t *region);
  
! slim_hidden_proto(pixman_region_create_simple)
  slim_hidden_proto(pixman_region_copy)
  slim_hidden_proto(pixman_region_union)
***************
*** 310,323 ****
  pixman_region_create (void)
  {
!     return pixman_region_createSimple (NULL);
  }
  
  /*****************************************************************
!  *   pixman_region_createSimple (extents)
   *     This routine creates a pixman_region16_t for a simple
   *     rectangular region.
   *****************************************************************/
  pixman_region16_t *
! pixman_region_createSimple (pixman_box16_t *extents)
  {
      pixman_region16_t *region;
--- 310,323 ----
  pixman_region_create (void)
  {
!     return pixman_region_create_simple (NULL);
  }
  
  /*****************************************************************
!  *   pixman_region_create_simple (extents)
   *     This routine creates a pixman_region16_t for a simple
   *     rectangular region.
   *****************************************************************/
  pixman_region16_t *
! pixman_region_create_simple (pixman_box16_t *extents)
  {
      pixman_region16_t *region;
***************
*** 331,335 ****
      return region;
  }
! slim_hidden_def(pixman_region_createSimple);
  
  /*****************************************************************
--- 331,335 ----
      return region;
  }
! slim_hidden_def(pixman_region_create_simple);
  
  /*****************************************************************
***************
*** 1151,1155 ****
  /* Convenience function for performing union of region with a single rectangle */
  pixman_region_status_t
! pixman_region_unionRect(pixman_region16_t *dest, pixman_region16_t *source,
  		   int x, int y, unsigned int width, unsigned int height)
  {
--- 1151,1155 ----
  /* Convenience function for performing union of region with a single rectangle */
  pixman_region_status_t
! pixman_region_union_rect(pixman_region16_t *dest, pixman_region16_t *source,
  		   int x, int y, unsigned int width, unsigned int height)
  {