[Commit] libpixregion/src pixregion.c, 1.2, 1.3 pixregion.h, 1.3, 1.4 pixregionint.h, 1.2, 1.3

[Richard Henderson]

Committed by: rth

Update of /local/src/CVS/libpixregion/src
In directory home.keithp.com:/tmp/cvs-serv22438/src

Modified Files:
	pixregion.c pixregion.h pixregionint.h 
Log Message:
        * configure.in: Run PKG_CHECK_MODULES on slim.
        * libpixregion.pc.in: Require slim.
        * src/pixregion.c (PixRegionCreateSimple): Mark hidden.
        (PixRegionCopy, PixRegionUnion): Mark hidden.
        * src/pixregion.h: Include and use X11/Xfuncproto.h.  Include
        slim_{export,import}.h as appropriate.  Mark all functions with
        __external_linkage.
        * src/pixregionint.h: Rename include protect to _PIXREGIONINT_H_.


Index: pixregion.c
===================================================================
RCS file: /local/src/CVS/libpixregion/src/pixregion.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pixregion.c	25 Feb 2003 18:28:05 -0000	1.2
+++ pixregion.c	30 Jul 2003 17:06:34 -0000	1.3
@@ -51,6 +51,7 @@
 #include <string.h>
 
 #include "pixregionint.h"
+#include <slim_internal.h>
 
 #if defined (__GNUC__) && !defined (NO_INLINES)
 #define INLINE	__inline
@@ -87,6 +88,10 @@
 static void
 PixRegionUninit (PixRegion *region);
 
+slim_hidden_proto(PixRegionCreateSimple)
+slim_hidden_proto(PixRegionCopy)
+slim_hidden_proto(PixRegionUnion)
+
 /*
  * The functions in this file implement the Region abstraction used extensively
  * throughout the X11 sample server. A Region is simply a set of disjoint
@@ -325,6 +330,7 @@
 
     return region;
 }
+slim_hidden_def(PixRegionCreateSimple)
 
 /*****************************************************************
  *   RegionInit(pReg, rect, size)
@@ -449,6 +455,7 @@
 	  dst->data->numRects * sizeof(PixRegionBox));
     return PixRegionStatusSuccess;
 }
+slim_hidden_def(PixRegionCopy)
 
 
 /*======================================================================
@@ -1232,6 +1239,7 @@
     good(newReg);
     return PixRegionStatusSuccess;
 }
+slim_hidden_def(PixRegionUnion)
 
 
 /*======================================================================

Index: pixregion.h
===================================================================
RCS file: /local/src/CVS/libpixregion/src/pixregion.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pixregion.h	25 Apr 2003 20:21:42 -0000	1.3
+++ pixregion.h	30 Jul 2003 17:06:34 -0000	1.4
@@ -46,8 +46,18 @@
 ******************************************************************/
 /* $Id$ */
 
-#ifndef PIXREGION_H
-#define PIXREGION_H
+#ifndef _PIXREGION_H_
+#define _PIXREGION_H_
+
+#include <X11/Xfuncproto.h>
+
+#ifdef _PIXREGIONINT_H_
+#include <slim_export.h>
+#else
+#include <slim_import.h>
+#endif
+
+_XFUNCPROTOBEGIN
 
 typedef struct _PixRegion PixRegion;
 
@@ -62,51 +72,51 @@
 
 /* creation/destruction */
 
-PixRegion *
+extern PixRegion * __external_linkage
 PixRegionCreate (void);
 
-PixRegion *
+extern PixRegion * __external_linkage
 PixRegionCreateSimple (PixRegionBox *extents);
 
-void
+extern void __external_linkage
 PixRegionDestroy (PixRegion *region);
 
 /* manipulation */
 
-void
+extern void __external_linkage
 PixRegionTranslate (PixRegion *region, int x, int y);
 
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionCopy (PixRegion *dest, PixRegion *source);
 
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionIntersect (PixRegion *newReg, PixRegion *reg1, PixRegion *reg2);
 
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionUnion (PixRegion *newReg, PixRegion *reg1, PixRegion *reg2);
 
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionUnionRect(PixRegion *dest, PixRegion *source,
 		   int x, int y, unsigned int width, unsigned int height);
 
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionSubtract (PixRegion *regD, PixRegion *regM, PixRegion *regS);
 
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionInverse (PixRegion *newReg, PixRegion *reg1, PixRegionBox *invRect);
 
 /* XXX: Need to fix this so it doesn't depend on an X data structure
-PixRegion *
+extern PixRegion * __external_linkage
 RectsToPixRegion (int nrects, xRectanglePtr prect, int ctype);
 */
 
 /* querying */
 
 /* XXX: These should proably be combined: PixRegionGetRects? */
-int
+extern int __external_linkage
 PixRegionNumRects (PixRegion *region);
 
-PixRegionBox *
+extern PixRegionBox * __external_linkage
 PixRegionRects (PixRegion *region);
 
 /* XXX: Change to an enum */
@@ -114,36 +124,39 @@
 #define rgnIN  1
 #define rgnPART 2
 
-int
+extern int __external_linkage
 PixRegionPointInRegion (PixRegion *region, int x, int y, PixRegionBox *box);
 
-int
+extern int __external_linkage
 PixRegionRectIn (PixRegion *PixRegion, PixRegionBox *prect);
 
-int
+extern int __external_linkage
 PixRegionNotEmpty (PixRegion *region);
 
-PixRegionBox *
+extern PixRegionBox * __external_linkage
 PixRegionExtents (PixRegion *region);
 
 /* mucking around */
 
 /* WARNING: calling PixRegionAppend may leave dest as an invalid
    region. Follow-up with PixRegionValidate to fix it up. */
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionAppend (PixRegion *dest, PixRegion *region);
 
-PixRegionStatus
+extern PixRegionStatus __external_linkage
 PixRegionValidate (PixRegion *badreg, int *pOverlap);
 
 /* Unclassified functionality
  * XXX: Do all of these need to be exported?
  */
 
-void
+extern void __external_linkage
 PixRegionReset (PixRegion *region, PixRegionBox *pBox);
 
-void
+extern void __external_linkage
 PixRegionEmpty (PixRegion *region);
 
-#endif /* PIXREGION_H */
+_XFUNCPROTOEND
+#undef __external_linkage
+
+#endif /* _PIXREGION_H_ */

Index: pixregionint.h
===================================================================
RCS file: /local/src/CVS/libpixregion/src/pixregionint.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pixregionint.h	25 Apr 2003 20:21:42 -0000	1.2
+++ pixregionint.h	30 Jul 2003 17:06:34 -0000	1.3
@@ -46,8 +46,8 @@
 ******************************************************************/
 /* $Id$ */
 
-#ifndef PIXREGIONINT_H
-#define PIXREGIONINT_H
+#ifndef _PIXREGIONINT_H_
+#define _PIXREGIONINT_H_
 
 #include "pixregion.h"
 
@@ -80,4 +80,4 @@
 #define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->numRects - 1)
 #define PIXREGION_SZOF(n) (sizeof(PixRegionData) + ((n) * sizeof(PixRegionBox)))
 
-#endif
+#endif /* _PIXREGIONINT_H_ */