[Commit] libic/src ic.h,1.6,1.7
commit@keithp.com
commit@keithp.com
Wed, 23 Apr 2003 07:17:59 -0700
Committed by: cworth
Update of /local/src/CVS/libic/src
In directory home.keithp.com:/tmp/cvs-serv19936/src
Modified Files:
ic.h
Log Message:
extern "C" stuff to support C++ (Fredrik Höglund)
Index: ic.h
===================================================================
RCS file: /local/src/CVS/libic/src/ic.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ic.h 17 Apr 2003 15:48:22 -0000 1.6
+++ ic.h 23 Apr 2003 14:17:57 -0000 1.7
@@ -29,6 +29,14 @@
#include "pixregion.h"
+#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
+#define _ICFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */
+#define _ICFUNCPROTOEND }
+#else
+#define _ICFUNCPROTOBEGIN
+#define _ICFUNCPROTOEND
+#endif
+
/* icformat.c */
/* XXX: Change from int to enum for IcFormatName */
@@ -45,6 +53,8 @@
int alpha, alphaMask;
} IcFormat;
+_ICFUNCPROTOBEGIN
+
void
IcFormatInit (IcFormat *format, IcFormatName name);
@@ -191,5 +201,7 @@
int yDst,
int width,
int height);
+
+_ICFUNCPROTOEND
#endif /* _IC_H_ */