Revert "Remove fcprivate.h, move the remaining macros to fcint.h."

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index 62a04b8e5266016f7dc2b4c22dc7b29aefde45f0..922a2df0ce51ec885f2d001dcb930ef6cb87b8d8 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -46,6 +46,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <fontconfig/fontconfig.h>
+#include <fontconfig/fcprivate.h>
 #include <fontconfig/fcfreetype.h>
 #include "fcdeprecate.h"
 
@@ -496,100 +497,6 @@ typedef struct _FcCharMap FcCharMap;
 /* watch out; assumes that v is void * -PL */
 #define ALIGN(v,type) ((void *)(((uintptr_t)(v) + fc_alignof(type) - 1) & ~(fc_alignof(type) - 1)))
 
-/*
- * I tried this with functions that took va_list* arguments
- * but portability concerns made me change these functions
- * into macros (sigh).
- */
-
-#define FcPatternVapBuild(result, orig, va)                        \
-{                                                                  \
-    FcPattern  *__p__ = (orig);                                    \
-    const char *__o__;                                             \
-    FcValue    __v__;                                              \
-                                                                   \
-    if (!__p__)                                                            \
-    {                                                              \
-       __p__ = FcPatternCreate ();                                 \
-       if (!__p__)                                                 \
-           goto _FcPatternVapBuild_bail0;                          \
-    }                                                              \
-    for (;;)                                                       \
-    {                                                              \
-       __o__ = va_arg (va, const char *);                          \
-       if (!__o__)                                                 \
-           break;                                                  \
-       __v__.type = va_arg (va, FcType);                           \
-       switch (__v__.type) {                                       \
-       case FcTypeVoid:                                            \
-           goto _FcPatternVapBuild_bail1;                          \
-       case FcTypeInteger:                                         \
-           __v__.u.i = va_arg (va, int);                           \
-           break;                                                  \
-       case FcTypeDouble:                                          \
-           __v__.u.d = va_arg (va, double);                        \
-           break;                                                  \
-       case FcTypeString:                                          \
-           __v__.u.s = va_arg (va, const FcChar8 *);               \
-           break;                                                  \
-       case FcTypeBool:                                            \
-           __v__.u.b = va_arg (va, FcBool);                        \
-           break;                                                  \
-       case FcTypeMatrix:                                          \
-           __v__.u.m = va_arg (va, const FcMatrix *);              \
-           break;                                                  \
-       case FcTypeCharSet:                                         \
-           __v__.u.c = va_arg (va, const FcCharSet *);             \
-           break;                                                  \
-       case FcTypeFTFace:                                          \
-           __v__.u.f = va_arg (va, FT_Face);                       \
-           break;                                                  \
-       case FcTypeLangSet:                                         \
-           __v__.u.l = va_arg (va, const FcLangSet *);             \
-           break;                                                  \
-       }                                                           \
-       if (!FcPatternAdd (__p__, __o__, __v__, FcTrue))            \
-           goto _FcPatternVapBuild_bail1;                          \
-    }                                                              \
-    result = __p__;                                                \
-    goto _FcPatternVapBuild_return;                                \
-                                                                   \
-_FcPatternVapBuild_bail1:                                          \
-    if (!orig)                                                     \
-       FcPatternDestroy (__p__);                                   \
-_FcPatternVapBuild_bail0:                                          \
-    result = (void*)0;                                             \
-                                                                   \
-_FcPatternVapBuild_return:                                         \
-    ;                                                              \
-}
-
-
-#define FcObjectSetVapBuild(__ret__, __first__, __va__)                \
-{                                                                      \
-    FcObjectSet    *__os__;                                            \
-    const char     *__ob__;                                            \
-                                                                       \
-    __ret__ = 0;                                                       \
-    __os__ = FcObjectSetCreate ();                                     \
-    if (!__os__)                                                       \
-       goto _FcObjectSetVapBuild_bail0;                                \
-    __ob__ = __first__;                                                        \
-    while (__ob__)                                                     \
-    {                                                                  \
-       if (!FcObjectSetAdd (__os__, __ob__))                           \
-           goto _FcObjectSetVapBuild_bail1;                            \
-       __ob__ = va_arg (__va__, const char *);                         \
-    }                                                                  \
-    __ret__ = __os__;                                                  \
-                                                                       \
-_FcObjectSetVapBuild_bail1:                                            \
-    if (!__ret__ && __os__)                                            \
-       FcObjectSetDestroy (__os__);                                    \
-_FcObjectSetVapBuild_bail0:                                            \
-    ;                                                                  \
-}
-
 /* fcblanks.c */
 
 /* fccache.c */