From 789a90472a461ec9f4ec19d1f3417aa9c81e5b10 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Sun, 30 May 2010 01:24:59 -0400 Subject: [PATCH] Some of the patches from Thomash Schmitt on http://lists.gnu.org/archive/html/libcdio-devel/2010-05/msg00005.html. More later when I get back to the states. --- lib/cdda_interface/common_interface.c | 8 ++++---- lib/cdda_interface/common_interface.h | 4 +--- lib/udf/udf.c | 8 ++++---- lib/udf/udf_file.c | 4 +++- src/cd-paranoia/Makefile.am | 4 ++-- src/cd-paranoia/report.c | 9 +++++---- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/lib/cdda_interface/common_interface.c b/lib/cdda_interface/common_interface.c index 59b62663..f72371a6 100644 --- a/lib/cdda_interface/common_interface.c +++ b/lib/cdda_interface/common_interface.c @@ -1,7 +1,5 @@ /* - $Id: common_interface.c,v 1.17 2008/04/16 17:00:40 karl Exp $ - - Copyright (C) 2004, 2005, 2007, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2007, 2008, 2010 Rocky Bernstein Copyright (C) 1998, 2002 Monty monty@xiph.org This program is free software: you can redistribute it and/or modify @@ -25,8 +23,10 @@ * ******************************************************************/ -#include +/* common_interface.h has to come first else _FILE_OFFSET_BITS are + redefined in say opensolaris. */ #include "common_interface.h" +#include #include "utils.h" #include "smallft.h" diff --git a/lib/cdda_interface/common_interface.h b/lib/cdda_interface/common_interface.h index aa1b30f3..216ebd39 100644 --- a/lib/cdda_interface/common_interface.h +++ b/lib/cdda_interface/common_interface.h @@ -1,7 +1,5 @@ /* - $Id: common_interface.h,v 1.7 2008/04/16 17:00:40 karl Exp $ - - Copyright (C) 2004, 2005, 2008, 2009 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2009, 2010 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify diff --git a/lib/udf/udf.c b/lib/udf/udf.c index b4cb00b4..e612b7c2 100644 --- a/lib/udf/udf.c +++ b/lib/udf/udf.c @@ -1,7 +1,5 @@ /* - $Id: udf.c,v 1.13 2008/04/24 07:28:00 rocky Exp $ - - Copyright (C) 2005, 2008 Rocky Bernstein + Copyright (C) 2005, 2008, 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 @@ -18,8 +16,10 @@ */ /* Access routines */ -#include +/* udf_private.h has to come first else _FILE_OFFSET_BITS are redefined in + say opensolaris. */ #include "udf_private.h" +#include #ifdef HAVE_STRING_H # include diff --git a/lib/udf/udf_file.c b/lib/udf/udf_file.c index 7afe1b42..11ce67aa 100644 --- a/lib/udf/udf_file.c +++ b/lib/udf/udf_file.c @@ -18,8 +18,10 @@ */ /* Access routines */ -#include +/* udf_private.h has to come first else _FILE_OFFSET_BITS are redefined in + say opensolaris. */ #include "udf_private.h" +#include #include "udf_fs.h" #ifdef HAVE_STRING_H diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am index c0ec4224..676dc587 100644 --- a/src/cd-paranoia/Makefile.am +++ b/src/cd-paranoia/Makefile.am @@ -47,10 +47,10 @@ cd-paranoia.$(OBJEXT): usage.h if HAVE_PERL usage.h: usage.txt $(srcdir)/pod2c.pl - $(PERL) $(srcdir)/pod2c.pl $< >$@ + $(PERL) $(srcdir)/pod2c.pl usage.txt >$@ else usage.h: usage-copy.h - cp $< $@ + cp usage-copy.h $@ endif endif diff --git a/src/cd-paranoia/report.c b/src/cd-paranoia/report.c index 9c8ce678..18ff7ccc 100644 --- a/src/cd-paranoia/report.c +++ b/src/cd-paranoia/report.c @@ -1,7 +1,5 @@ /* - $Id: report.c,v 1.3 2008/04/11 15:44:00 karl Exp $ - - Copyright (C) 2004, 2008 Rocky Bernstein + Copyright (C) 2004, 2008, 2010 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu This program is free software: you can redistribute it and/or modify @@ -24,8 +22,11 @@ * ******************************************************************/ -#include + +/* config.h has to come first else _FILE_OFFSET_BITS are redefined in + say opensolaris. */ #include "config.h" +#include #include #include "report.h"