From d1f318ef7309facd3988343199f36cf103b689a5 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 18 Nov 2019 13:47:37 +0100 Subject: [PATCH] build: fix build on musl Closes: https://github.com/containers/fuse-overlayfs/issues/145 Signed-off-by: Giuseppe Scrivano --- fuse_overlayfs_error.h | 40 ++++++++++++++++++++++++++++++++++++++++ main.c | 16 +--------------- plugin-manager.c | 2 +- 3 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 fuse_overlayfs_error.h diff --git a/fuse_overlayfs_error.h b/fuse_overlayfs_error.h new file mode 100644 index 0000000..748dd44 --- /dev/null +++ b/fuse_overlayfs_error.h @@ -0,0 +1,40 @@ +/* fuse-overlayfs: Overlay Filesystem in Userspace + + Copyright (C) 2019 Red Hat Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef FUSE_OVERLAYFS_ERROR_H +# define FUSE_OVERLAYFS_ERROR_H + +# include + +# ifdef HAVE_ERROR_H +# include +# else +# define error(status, errno, fmt, ...) do { \ + if (errno == 0) \ + fprintf (stderr, "fuse-overlayfs: " fmt "\n", ##__VA_ARGS__); \ + else \ + { \ + fprintf (stderr, "fuse-overlayfs: " fmt, ##__VA_ARGS__); \ + fprintf (stderr, ": %s\n", strerror (errno)); \ + } \ + if (status) \ + exit (status); \ + } while(0) +# endif + +#endif diff --git a/main.c b/main.c index fea2392..71b7e1f 100644 --- a/main.c +++ b/main.c @@ -43,21 +43,7 @@ # include #endif -#ifdef HAVE_ERROR_H -# include -#else -# define error(status, errno, fmt, ...) do { \ - if (errno == 0) \ - fprintf (stderr, "fuse-overlayfs: " fmt "\n", ##__VA_ARGS__); \ - else \ - { \ - fprintf (stderr, "fuse-overlayfs: " fmt, ##__VA_ARGS__); \ - fprintf (stderr, ": %s\n", strerror (errno)); \ - } \ - if (status) \ - exit (status); \ - } while(0) -#endif +#include #include #include diff --git a/plugin-manager.c b/plugin-manager.c index 1dea66c..6a88ad3 100644 --- a/plugin-manager.c +++ b/plugin-manager.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include