Update for 2.3.0

[fontconfig.git] / fontconfig / fcprivate.h

diff --git a/fontconfig/fcprivate.h b/fontconfig/fcprivate.h
index 490ca33657791a8e36adc057ee9472d6916a6090..ac68bfc0fcd1f5b5472f149215d9dd74c298508f 100644 (file)
--- a/fontconfig/fcprivate.h
+++ b/fontconfig/fcprivate.h
@@ -1,7 +1,7 @@
 /*
- * $XFree86: $
+ * $RCSId: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.5 2002/08/19 19:32:04 keithp Exp $
  *
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2001 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -59,7 +59,7 @@
            __v__.u.d = va_arg (va, double);                        \
            break;                                                  \
        case FcTypeString:                                          \
-           __v__.u.s = va_arg (va, char *);                        \
+           __v__.u.s = va_arg (va, FcChar8 *);                     \
            break;                                                  \
        case FcTypeBool:                                            \
            __v__.u.b = va_arg (va, FcBool);                        \
@@ -70,6 +70,12 @@
        case FcTypeCharSet:                                         \
            __v__.u.c = va_arg (va, FcCharSet *);                   \
            break;                                                  \
+       case FcTypeFTFace:                                          \
+           __v__.u.f = va_arg (va, FT_Face);                       \
+           break;                                                  \
+       case FcTypeLangSet:                                         \
+           __v__.u.l = va_arg (va, FcLangSet *);                   \
+           break;                                                  \
        }                                                           \
        if (!FcPatternAdd (__p__, __o__, __v__, FcTrue))            \
            goto _FcPatternVapBuild_bail1;                          \
@@ -81,7 +87,7 @@ _FcPatternVapBuild_bail1:                                         \
     if (!orig)                                                     \
        FcPatternDestroy (__p__);                                   \
 _FcPatternVapBuild_bail0:                                          \
-    result = 0;                                                            \
+    result = (void*)0;                                             \
                                                                    \
 _FcPatternVapBuild_return:                                         \
     ;                                                              \