Fix the build issue with --enable-static
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109
This commit is contained in:
parent
844d8709a1
commit
8208f99fa1
|
@ -223,6 +223,18 @@ This is just a wrapper around free(3) which helps track memory usage of
|
||||||
strings within the fontconfig library.
|
strings within the fontconfig library.
|
||||||
@@
|
@@
|
||||||
|
|
||||||
|
@RET@ FcChar8 *
|
||||||
|
@FUNC@ FcStrBuildFilename
|
||||||
|
@TYPE1@ const FcChar8 * @ARG1@ path
|
||||||
|
@TYPE2@ ...
|
||||||
|
@PURPOSE@ Concatenate strings as a file path
|
||||||
|
@DESC@
|
||||||
|
Creates a filename from the given elements of strings as file paths
|
||||||
|
and concatenate them with the appropriate file separator.
|
||||||
|
Arguments must be null-terminated.
|
||||||
|
This returns a newly-allocated memory which should be freed when no longer needed.
|
||||||
|
@@
|
||||||
|
|
||||||
@RET@ FcChar8 *
|
@RET@ FcChar8 *
|
||||||
@FUNC@ FcStrDirname
|
@FUNC@ FcStrDirname
|
||||||
@TYPE1@ const FcChar8 * @ARG1@ file
|
@TYPE1@ const FcChar8 * @ARG1@ file
|
||||||
|
|
|
@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8 *string,
|
||||||
int *nchar,
|
int *nchar,
|
||||||
int *wchar);
|
int *wchar);
|
||||||
|
|
||||||
|
FcPublic FcChar8 *
|
||||||
|
FcStrBuildFilename (const FcChar8 *path,
|
||||||
|
...);
|
||||||
|
|
||||||
FcPublic FcChar8 *
|
FcPublic FcChar8 *
|
||||||
FcStrDirname (const FcChar8 *file);
|
FcStrDirname (const FcChar8 *file);
|
||||||
|
|
||||||
|
|
|
@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s);
|
||||||
FcPrivate FcBool
|
FcPrivate FcBool
|
||||||
FcStrIsAbsoluteFilename (const FcChar8 *s);
|
FcStrIsAbsoluteFilename (const FcChar8 *s);
|
||||||
|
|
||||||
FcPrivate FcChar8 *
|
|
||||||
FcStrBuildFilename (const FcChar8 *path,
|
|
||||||
...);
|
|
||||||
|
|
||||||
FcPrivate FcChar8 *
|
FcPrivate FcChar8 *
|
||||||
FcStrLastSlash (const FcChar8 *path);
|
FcStrLastSlash (const FcChar8 *path);
|
||||||
|
|
||||||
|
|
|
@ -25,25 +25,26 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
#ifndef HAVE_STRUCT_DIRENT_D_TYPE
|
#ifndef HAVE_STRUCT_DIRENT_D_TYPE
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
#endif
|
||||||
#include "fcstr.c"
|
|
||||||
#undef FcConfigBuildFonts
|
|
||||||
#undef FcConfigCreate
|
|
||||||
#undef FcConfigGetCurrent
|
|
||||||
#undef FcConfigParseAndLoadFromMemory
|
|
||||||
#undef FcConfigUptoDate
|
|
||||||
#undef FcFontList
|
|
||||||
#undef FcInitReinitialize
|
|
||||||
#undef FcPatternCreate
|
|
||||||
#undef FcPatternDestroy
|
|
||||||
#include <fontconfig/fontconfig.h>
|
#include <fontconfig/fontconfig.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# define FC_DIR_SEPARATOR '\\'
|
||||||
|
# define FC_DIR_SEPARATOR_S "\\"
|
||||||
|
#else
|
||||||
|
# define FC_DIR_SEPARATOR '/'
|
||||||
|
# define FC_DIR_SEPARATOR_S "/"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_MKDTEMP
|
#ifdef HAVE_MKDTEMP
|
||||||
#define fc_mkdtemp mkdtemp
|
#define fc_mkdtemp mkdtemp
|
||||||
#else
|
#else
|
||||||
|
@ -154,18 +155,6 @@ unlink_dirs (const char *dir)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
FcChar8 *
|
|
||||||
FcLangNormalize (const FcChar8 *lang)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
FcChar8 *
|
|
||||||
FcConfigHome (void)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main (void)
|
main (void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue