diff --git a/example/cdchange.c b/example/cdchange.c
index ca1ca918..9488dd5e 100644
--- a/example/cdchange.c
+++ b/example/cdchange.c
@@ -16,15 +16,17 @@
along with this program. If not, see .
*/
+/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
+ say opensolaris. */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include
/* Test media changed */
#include
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#ifdef HAVE_LIMITS_H
#include
#endif
diff --git a/example/isofile.c b/example/isofile.c
index d941d66f..4878fb32 100644
--- a/example/isofile.c
+++ b/example/isofile.c
@@ -31,10 +31,13 @@
#define LOCAL_FILENAME "copying"
+/* portable.h has to come first else _FILE_OFFSET_BITS are redefined in
+ say opensolaris. */
+#include "portable.h"
+
#include
#include
#include
-#include "portable.h"
#include
diff --git a/example/isofile2.c b/example/isofile2.c
index 329263e9..753fe557 100644
--- a/example/isofile2.c
+++ b/example/isofile2.c
@@ -35,11 +35,13 @@
#define ISO9660_FILENAME "COPYING"
#define LOCAL_FILENAME "copying"
+/* portable.h has to come first else _FILE_OFFSET_BITS are redefined in
+ say opensolaris. */
+#include "portable.h"
+
#include
#include
-#include "portable.h"
-
#ifdef HAVE_SYS_TYPES_H
#include
#endif
diff --git a/example/isofuzzy.c b/example/isofuzzy.c
index 7323d699..15e81efd 100644
--- a/example/isofuzzy.c
+++ b/example/isofuzzy.c
@@ -26,11 +26,14 @@
#define ISO9660_IMAGE_PATH "/tmp/"
#define ISO9660_IMAGE ISO9660_IMAGE_PATH "vcd_demo.bin"
+/* portable.h has to come first else _FILE_OFFSET_BITS are redefined in
+ say opensolaris. */
+#include "portable.h"
+
#include
#include
#include
-#include "portable.h"
#include
#ifdef HAVE_ERRNO_H
diff --git a/example/paranoia.c b/example/paranoia.c
index c2ab4a7c..8a904168 100644
--- a/example/paranoia.c
+++ b/example/paranoia.c
@@ -18,14 +18,16 @@
/* Simple program to show using libcdio's version of the CD-DA paranoia.
library. */
-#include
-#include
-#include
-
+/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
+ say opensolaris. */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include
+#include
+#include
+
#ifdef HAVE_STDLIB_H
#include
#endif
diff --git a/example/udffile.c b/example/udffile.c
index 42290446..ddcd8b4b 100644
--- a/example/udffile.c
+++ b/example/udffile.c
@@ -22,6 +22,12 @@
things on the C++ side.
*/
+/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
+ say opensolaris. */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
/* This is the UDF image. */
#define UDF_IMAGE_PATH "../"
#define UDF_IMAGE "../test/udf102.iso"
@@ -34,10 +40,6 @@
#include
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#ifdef HAVE_ERRNO_H
#include
#endif
diff --git a/include/cdio/dvd.h b/include/cdio/dvd.h
index b9ed9e10..8bb83e12 100644
--- a/include/cdio/dvd.h
+++ b/include/cdio/dvd.h
@@ -58,16 +58,16 @@
#define CDIO_DVD_BOOK_DVD_PR_DL 0xe /**< DVD+R DL */
typedef struct cdio_dvd_layer {
- uint8_t book_version : 4;
- uint8_t book_type : 4;
- uint8_t min_rate : 4;
- uint8_t disc_size : 4;
- uint8_t layer_type : 4;
- uint8_t track_path : 1;
- uint8_t nlayers : 2;
- uint8_t track_density : 4;
- uint8_t linear_density: 4;
- uint8_t bca : 1;
+ unsigned int book_version : 4;
+ unsigned int book_type : 4;
+ unsigned int min_rate : 4;
+ unsigned int disc_size : 4;
+ unsigned int layer_type : 4;
+ unsigned int track_path : 1;
+ unsigned int nlayers : 2;
+ unsigned int track_density : 4;
+ unsigned int linear_density : 4;
+ unsigned int bca : 1;
uint32_t start_sector;
uint32_t end_sector;
uint32_t end_sector_l0;
diff --git a/include/cdio/mmc.h b/include/cdio/mmc.h
index 2423147b..e21a9d70 100644
--- a/include/cdio/mmc.h
+++ b/include/cdio/mmc.h
@@ -121,7 +121,7 @@ extern "C" {
CDIO_MMC_SENSE_KEY_VENDOR_SPECIFIC = 9,
CDIO_MMC_SENSE_KEY_COPY_ABORTED = 10,
CDIO_MMC_SENSE_KEY_ABORTED_COMMAND = 11,
- CDIO_MMC_SENSE_KEY_OBSOLTE = 12,
+ CDIO_MMC_SENSE_KEY_OBSOLETE = 12,
} cdio_mmc_sense_key_t;
/**
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"
diff --git a/src/cdda-player.c b/src/cdda-player.c
index 82edaa4a..7ba91c9f 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -1,7 +1,7 @@
/*
$Id: cdda-player.c,v 1.50 2008/06/19 15:44:14 flameeyes Exp $
- Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein
+ Copyright (C) 2005, 2006, 2008, 2009, 2010 Rocky Bernstein
Adapted from Gerd Knorr's player.c program
Copyright (C) 1997, 1998
@@ -851,7 +851,7 @@ get_track_info(track_t i_track)
}
#define display_line(LINE_NO, COL_NO, format_str, field) \
- if (field && field[0]) { \
+ if (field != NULL && field[0]) { \
mvprintw(LINE_NO, COL_NO, (char *) format_str " [%s]", \
field, \
b_cdtext_ ## field ? "CD-Text": "CDDB"); \