From 42534c91f6e3cc896782ebd82c46918156a052bf Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Tue, 30 Nov 2010 21:27:43 -0500 Subject: [PATCH] Guard against not having S_ISLNK and S_ISSOCK. --- lib/iso9660/rock.c | 13 +++++++++---- src/util.c | 12 +++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/iso9660/rock.c b/lib/iso9660/rock.c index 415d836a..966ac58f 100644 --- a/lib/iso9660/rock.c +++ b/lib/iso9660/rock.c @@ -1,7 +1,5 @@ /* - $Id: rock.c,v 1.18 2008/04/18 16:02:09 karl Exp $ - - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 2010 Rocky Bernstein Adapted from GNU/Linux fs/isofs/rock.c (C) 1992, 1993 Eric Youngdale This program is free software: you can redistribute it and/or modify @@ -14,7 +12,7 @@ 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 +n You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Rock Ridge Extensions to iso9660 */ @@ -36,6 +34,13 @@ # include #endif +#ifndef HAVE_S_ISLNK +# define S_ISLNK(s) ((void)s,0) +endif +#ifndef HAVE_S_ISSOCK +# define S_ISSOCK(s) ((void)s,0) +#endif + #include #include #include diff --git a/src/util.c b/src/util.c index bfaca828..c23a2ed2 100644 --- a/src/util.c +++ b/src/util.c @@ -1,7 +1,6 @@ /* - $Id: util.c,v 1.54 2008/04/14 17:30:27 karl Exp $ - - Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 + Rocky Bernstein 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 @@ -27,6 +26,13 @@ # include #endif +#ifndef HAVE_S_ISLNK +# define S_ISLNK(s) ((void)s,0) +#endif +#ifndef HAVE_S_ISSOCK +# define S_ISSOCK(s) ((void)s,0) +#endif + cdio_log_handler_t gl_default_cdio_log_handler = NULL; char *source_name = NULL; char *program_name;