Remove fcprivate.h, move the remaining macros to fcint.h.
fcprivate.h was supposed to extend the fontconfig API for the various fontconfig utilities. Instead, just have those utilities use the internal fcint.h header file (which they already do), removing fcprivate.h from the installation and hence from the defacto public API.
This commit is contained in:
Keith Packard
parent
910db318ae
commit
b607922909
|
|
@ -2,7 +2,6 @@ fontconfigincludedir=$(includedir)/fontconfig
|
|||
|
||||
fontconfig_headers= \
|
||||
fontconfig.h \
|
||||
fcfreetype.h \
|
||||
fcprivate.h
|
||||
fcfreetype.h
|
||||
|
||||
fontconfiginclude_HEADERS = $(fontconfig_headers)
|
||||
|
|
|
|||
|
|
@ -1,123 +0,0 @@
|
|||
/*
|
||||
* $RCSId: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.5 2002/08/19 19:32:04 keithp Exp $
|
||||
*
|
||||
* 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
|
||||
* advertising or publicity pertaining to distribution of the software without
|
||||
* specific, written prior permission. Keith Packard makes 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,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL KEITH PACKARD 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
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef _FCPRIVATE_H_
|
||||
#define _FCPRIVATE_H_
|
||||
|
||||
/*
|
||||
* 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: \
|
||||
; \
|
||||
}
|
||||
|
||||
#endif /* _FCPRIVATE_H_ */
|
||||
|
||||
|
|
@ -124,8 +124,7 @@ uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib
|
|||
|
||||
PUBLIC_FILES = \
|
||||
$(top_srcdir)/fontconfig/fontconfig.h \
|
||||
$(top_srcdir)/fontconfig/fcfreetype.h \
|
||||
$(top_srcdir)/fontconfig/fcprivate.h
|
||||
$(top_srcdir)/fontconfig/fcfreetype.h
|
||||
|
||||
fcaliastail.h: fcalias.h
|
||||
|
||||
|
|
|
|||
95
src/fcint.h
95
src/fcint.h
|
|
@ -46,7 +46,6 @@
|
|||
#include <sys/stat.h>
|
||||
#include <time.h>
|
||||
#include <fontconfig/fontconfig.h>
|
||||
#include <fontconfig/fcprivate.h>
|
||||
#include <fontconfig/fcfreetype.h>
|
||||
|
||||
#ifndef FC_CONFIG_PATH
|
||||
|
|
@ -496,6 +495,100 @@ 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 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue