Add valist sentinel markup for FcObjectSetBuild and FcPatternBuild.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 10a3d46ca4ad3f03e01faa7c772c917d2821a3fd..2a37be5317a704a7a805a5ba023d33b5161a51dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2005-10-14  Ross Burton <ross@burtonini.com>
+2005-10-20  Marcus Meissner  <meissner@suse.de>
+       reviewed by: plam
+
+       * fontconfig/fontconfig.h:
+
+       Add valist sentinel markup for FcObjectSetBuild and FcPatternBuild.
+       
+2005-10-14  Ross Burton  <ross@burtonini.com>
        reviewed by: plam
 
        * fc-glyphname/fc-glyphname.c:

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 2ffcb245e2f5963030db448c5a8171fb1c658c15..d74088db317d838e217eff530e1d40da92ed7942 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -27,6 +27,12 @@
 
 #include <stdarg.h>
 
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+#define FC_ATTRIBUTE_SENTINEL(x) __attribute__((__sentinel__(0)))
+#else
+#define FC_ATTRIBUTE_SENTINEL(x)
+#endif
+
 typedef unsigned char  FcChar8;
 typedef unsigned short FcChar16;
 typedef unsigned int   FcChar32;
@@ -534,7 +540,7 @@ FcObjectSet *
 FcObjectSetVaBuild (const char *first, va_list va);
 
 FcObjectSet *
-FcObjectSetBuild (const char *first, ...);
+FcObjectSetBuild (const char *first, ...) FC_ATTRIBUTE_SENTINEL(0);
 
 FcFontSet *
 FcFontSetList (FcConfig            *config,
@@ -751,7 +757,7 @@ FcPattern *
 FcPatternVaBuild (FcPattern *orig, va_list va);
     
 FcPattern *
-FcPatternBuild (FcPattern *orig, ...);
+FcPatternBuild (FcPattern *orig, ...) FC_ATTRIBUTE_SENTINEL(0);
 
 /* fcstr.c */
 
@@ -853,4 +859,6 @@ FcConfigParseAndLoad (FcConfig *config, const FcChar8 *file, FcBool complain);
 
 _FCFUNCPROTOEND
 
+#undef FC_ATTRIBUTE_SENTINEL
+
 #endif /* _FONTCONFIG_H_ */