diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-10-17 03:17:17 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-10-17 03:17:17 +0000 |
| commit | 93d615ceeeb67ecc9b3b05340fee1f4b841816b8 (patch) | |
| tree | fce4267a66efa4ca2202174b36f265484930ff45 | |
| parent | 3c947ecb260977724f2e53a3379df88b26713d1a (diff) | |
| parent | 5786e83a13da81559a7b80b482715e7b9ecceb64 (diff) | |
| download | pango-93d615ceeeb67ecc9b3b05340fee1f4b841816b8.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
Fix the build
See merge request GNOME/pango!652
| -rw-r--r-- | examples/pangowin32tobmp.c | 2 | ||||
| -rw-r--r-- | meson.build | 27 | ||||
| -rw-r--r-- | pango/fonts.c | 2 | ||||
| -rw-r--r-- | pango/pango-utils.c | 10 |
4 files changed, 6 insertions, 35 deletions
diff --git a/examples/pangowin32tobmp.c b/examples/pangowin32tobmp.c index c27eac94..e14466e3 100644 --- a/examples/pangowin32tobmp.c +++ b/examples/pangowin32tobmp.c @@ -31,7 +31,7 @@ #include <errno.h> #include <string.h> -#ifdef HAVE_UNISTD_H +#ifndef G_OS_WIN32 #include <unistd.h> #endif #include <stdio.h> diff --git a/meson.build b/meson.build index f63ce6cd..d2a201f6 100644 --- a/meson.build +++ b/meson.build @@ -181,33 +181,6 @@ if host_machine.system() == 'linux' common_ldflags += cc.get_supported_link_arguments([ '-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now', ]) endif -# Functions -checked_funcs = [ - 'sysconf', - 'getpagesize', - 'flockfile', - 'strtok_r', -] - -foreach f: checked_funcs - if cc.has_function(f) - pango_conf.set('HAVE_' + f.underscorify().to_upper(), 1) - endif -endforeach - -# Headers -checked_headers = [ - 'unistd.h', - 'sys/mman.h', - 'dirent.h', -] - -foreach h: checked_headers - if cc.has_header(h) - pango_conf.set('HAVE_' + h.underscorify().to_upper(), 1) - endif -endforeach - # Use debug/optimization flags to determine whether to enable debug or disable # cast checks pango_debug_cflags = [] diff --git a/pango/fonts.c b/pango/fonts.c index 5f9bbb01..e259f8c7 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -1298,7 +1298,7 @@ parse_variations (const char *word, * * "Cantarell Italic Light 15 \@wght=200" * - * Returns: (transfer full) a new `PangoFontDescription`. + * Returns: (transfer full): a new `PangoFontDescription`. */ PangoFontDescription * pango_font_description_from_string (const char *str) diff --git a/pango/pango-utils.c b/pango/pango-utils.c index ce294230..7c85b0aa 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -34,14 +34,12 @@ #include <glib/gstdio.h> -#ifndef HAVE_FLOCKFILE -# define flockfile(f) (void)1 -# define funlockfile(f) (void)1 -# define getc_unlocked(f) getc(f) -#endif /* !HAVE_FLOCKFILE */ - #ifdef G_OS_WIN32 +#define flockfile(f) (void)1 +#define funlockfile(f) (void)1 +#define getc_unlocked(f) getc(f) + #include <sys/types.h> #define STRICT |