X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fontconfig%2Ffcprivate.h;h=ec964fce1a2d9263797623ef6fd3cf871a2068e8;hb=3074a73b418b40135d4a4f4e0713fcf987d34795;hp=16ea543ead1a4e7219e7536ae7e5d426f30ae85d;hpb=be0948508ce4ebbb6e576b9dd31531efef6834e1;p=fontconfig.git

diff --git a/fontconfig/fcprivate.h b/fontconfig/fcprivate.h
index 16ea543..ec964fc 100644
--- a/fontconfig/fcprivate.h
+++ b/fontconfig/fcprivate.h
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.2 2002/02/15 06:01:27 keithp Exp $
+ * fontconfig/fontconfig/fcprivate.h
  *
- * 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
@@ -13,9 +13,9 @@
  * representations about the suitability of this software for any purpose.  It
  * is provided "as is" without express or implied warranty.
  *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -59,19 +59,23 @@
 	    __v__.u.d = va_arg (va, double);			    \
 	    break;						    \
 	case FcTypeString:					    \
-	    __v__.u.s = va_arg (va, FcChar8 *);			    \
+	    __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, FcMatrix *);		    \
+	    __v__.u.m = va_arg (va, const FcMatrix *);		    \
 	    break;						    \
 	case FcTypeCharSet:					    \
-	    __v__.u.c = va_arg (va, FcCharSet *);		    \
+	    __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;			    \
@@ -83,7 +87,7 @@ _FcPatternVapBuild_bail1:					    \
     if (!orig)							    \
 	FcPatternDestroy (__p__);				    \
 _FcPatternVapBuild_bail0:					    \
-    result = 0;							    \
+    result = (void*)0;						    \
 								    \
 _FcPatternVapBuild_return:					    \
     ;								    \