claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against not having S_ISLNK and S_ISSOCK.

Browse Source
This commit is contained in:
R. Bernstein
2010-11-30 21:27:43 -05:00
parent 52f5643881
commit 42534c91f6
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/iso9660/rock.c
View File

@@ -1,7 +1,5 @@
/* /*
$Id: rock.c,v 1.18 2008/04/18 16:02:09 karl Exp $ Copyright (C) 2005, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Adapted from GNU/Linux fs/isofs/rock.c (C) 1992, 1993 Eric Youngdale 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 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 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. 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 <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* Rock Ridge Extensions to iso9660 */ /* Rock Ridge Extensions to iso9660 */
@@ -36,6 +34,13 @@
# include <sys/stat.h> # include <sys/stat.h>
#endif #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 <cdio/iso9660.h> #include <cdio/iso9660.h>
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/bytesex.h> #include <cdio/bytesex.h>

12
src/util.c
View File

@@ -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, 2010
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -27,6 +26,13 @@
# include <sys/stat.h> # include <sys/stat.h>
#endif #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; cdio_log_handler_t gl_default_cdio_log_handler = NULL;
char *source_name = NULL; char *source_name = NULL;
char *program_name; char *program_name;