X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fontconfig%2Ffcprivate.h;h=18b8c08ca77fdb1168df73b5eba0eecd89aa70fe;hb=a53553b4b65d6230b1a91b1a7433c8c5852ab055;hp=477e1df21dc217df8a576c1be811bd71ca0baaee;hpb=4c2967f6267b01022c4f3651dcc0072a225f4b01;p=fontconfig.git

diff --git a/fontconfig/fcprivate.h b/fontconfig/fcprivate.h
index 477e1df..18b8c08 100644
--- a/fontconfig/fcprivate.h
+++ b/fontconfig/fcprivate.h
@@ -1,21 +1,21 @@
 /*
- * $RCSId: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.5 2002/08/19 19:32:04 keithp Exp $
+ * fontconfig/fontconfig/fcprivate.h
  *
- * Copyright © 2001 Keith Packard
+ * 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
  * the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
+ * documentation, and that the name of the author(s) not be used in
  * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
+ * specific, written prior permission.  The authors make no
  * 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,22 +59,22 @@
 	    __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, FcLangSet *);		    \
+	    __v__.u.l = va_arg (va, const FcLangSet *);		    \
 	    break;						    \
 	}							    \
 	if (!FcPatternAdd (__p__, __o__, __v__, FcTrue))	    \