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