Re: [Libcdio-devel] Re: Patch for libcdio-0.83git/examples on Solaris snv134

[Rocky Bernstein]

Many thanks. Patch applied in git.

On Sun, May 30, 2010 at 7:45 AM, Thomas Schmitt <address@hidden> wrote:

> Hi,
>
> the reason for my missing patches seems not on
> the side of my mail provider alone but also of
> this suspicious mail header:
>
>  X-Content-Filtered-By: Mailman/MimeDel 2.1.5
>
>
> http://bazaar.launchpad.net/~mailman-coders/mailman/2.1/annotate/1234/Mailman/Handlers/MimeDel.py<http://bazaar.launchpad.net/%7Emailman-coders/mailman/2.1/annotate/1234/Mailman/Handlers/MimeDel.py>
> "This module scans a message for MIME content, removing those sections
> whose
>  MIME types match one of a list of matches.  multipart/alternative sections
> are
>  replaced by the first non-empty component, and multipart/mixed sections
>  wrapping only single sections after other processing are replaced by
> their"
>
> So i send the patch inline now:
> ------------------------------------------------
>
> --- libcdio-0.83git.orig/example/cdchange.c     2010-05-08
> 12:50:40.000000000 +0200
> +++ libcdio-0.83git.changed/example/cdchange.c  2010-05-30
> 13:10:59.978504739 +0200
> @@ -16,15 +16,17 @@
>   along with this program.  If not, see <http://www.gnu.org/licenses/>.
>  */
>
> +/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
> +   say opensolaris. */
> +#ifdef HAVE_CONFIG_H
> +# include "config.h"
> +#endif
> +
>  #include <cdio/cdio.h>
>
>  /* Test media changed */
>  #include <stdio.h>
>
> -#ifdef HAVE_CONFIG_H
> -# include "config.h"
> -#endif
> -
>  #ifdef HAVE_LIMITS_H
>  #include <limits.h>
>  #endif
> --- libcdio-0.83git.orig/example/isofile.c      2010-05-08
> 12:50:40.000000000 +0200
> +++ libcdio-0.83git.changed/example/isofile.c   2010-05-30
> 13:11:28.775398014 +0200
> @@ -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 <sys/types.h>
>  #include <cdio/cdio.h>
>  #include <cdio/iso9660.h>
> -#include "portable.h"
>
>  #include <stdio.h>
>
> --- libcdio-0.83git.orig/example/isofile2.c     2010-05-08
> 12:50:40.000000000 +0200
> +++ libcdio-0.83git.changed/example/isofile2.c  2010-05-30
> 13:11:41.802597484 +0200
> @@ -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 <cdio/cdio.h>
>  #include <cdio/iso9660.h>
>
> -#include "portable.h"
> -
>  #ifdef HAVE_SYS_TYPES_H
>  #include <sys/types.h>
>  #endif
> --- libcdio-0.83git.orig/example/isofuzzy.c     2010-05-08
> 12:50:40.000000000 +0200
> +++ libcdio-0.83git.changed/example/isofuzzy.c  2010-05-30
> 13:11:57.183649295 +0200
> @@ -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 <sys/types.h>
>  #include <cdio/cdio.h>
>  #include <cdio/iso9660.h>
>
> -#include "portable.h"
>  #include <stdio.h>
>
>  #ifdef HAVE_ERRNO_H
> --- libcdio-0.83git.orig/example/paranoia.c     2010-05-08
> 12:50:40.000000000 +0200
> +++ libcdio-0.83git.changed/example/paranoia.c  2010-05-30
> 13:12:54.163711212 +0200
> @@ -18,14 +18,16 @@
>  /* Simple program to show using libcdio's version of the CD-DA paranoia.
>    library. */
>
> -#include <cdio/paranoia.h>
> -#include <cdio/cd_types.h>
> -#include <stdio.h>
> -
> +/* config.h has to come first else _FILE_OFFSET_BITS are redefined in
> +   say opensolaris. */
>  #ifdef HAVE_CONFIG_H
>  # include "config.h"
>  #endif
>
> +#include <cdio/paranoia.h>
> +#include <cdio/cd_types.h>
> +#include <stdio.h>
> +
>  #ifdef HAVE_STDLIB_H
>  #include <stdlib.h>
>  #endif
> --- libcdio-0.83git.orig/example/udffile.c      2010-05-08
> 12:50:40.000000000 +0200
> +++ libcdio-0.83git.changed/example/udffile.c   2010-05-30
> 13:12:41.133126497 +0200
> @@ -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 <stdio.h>
>
> -#ifdef HAVE_CONFIG_H
> -# include "config.h"
> -#endif
> -
>  #ifdef HAVE_ERRNO_H
>  #include <errno.h>
>  #endif
>
> ------------------------------------------------
>
> Have a nice day :)
>
> Thomas
>
>
>