From 790c779e5d45e5ea024c221e60d3dd2277a7b7b9 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 14 Oct 2015 17:01:05 -0400 Subject: [PATCH] Port: Add Solaris paths compat MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- src/common/compat/Makefile.am | 2 +- src/common/compat/paths.h | 27 +++++++++++++++++++++++++++ src/common/daemonize.c | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/common/compat/paths.h diff --git a/src/common/compat/Makefile.am b/src/common/compat/Makefile.am index e12422585..b3973847d 100644 --- a/src/common/compat/Makefile.am +++ b/src/common/compat/Makefile.am @@ -10,4 +10,4 @@ endif libcompat_la_SOURCES = poll.h fcntl.h endian.h mman.h \ socket.h compat-fcntl.c uuid.h tid.h \ - getenv.h string.h prctl.h $(COMPAT) + getenv.h string.h prctl.h paths.h $(COMPAT) diff --git a/src/common/compat/paths.h b/src/common/compat/paths.h new file mode 100644 index 000000000..e1fcb7512 --- /dev/null +++ b/src/common/compat/paths.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2015 - Michael Jeanson + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2 only, + * as published by the Free Software Foundation. + * + * 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _COMPAT_PATHS_H +#define _COMPAT_PATHS_H + +#ifdef HAVE_PATHS_H +# include +#else +# define _PATH_DEVNULL "/dev/null" +#endif + +#endif /* _COMPAT_PATHS_H */ diff --git a/src/common/daemonize.c b/src/common/daemonize.c index 4b4531d53..300851bb3 100644 --- a/src/common/daemonize.c +++ b/src/common/daemonize.c @@ -18,7 +18,7 @@ #define _LGPL_SOURCE #include -#include +#include #include #include #include -- 2.34.1