Merge pull request #55 from libcdio/gcc-tolerance

GCC 15 tolerance

Author: rocky

src/getopt.c

@@ -2,7 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to [email protected]
    before changing it!
-   Copyright (C) 1987-2014 Free Software Foundation, Inc.
+   Copyright (C) 1987-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -145,7 +145,7 @@ static struct _getopt_data getopt_data;
    whose names are inconsistent.  */
 
 #ifndef getenv
-extern char *getenv();
+extern char *getenv(const char *);
 #endif
 
 #endif /* not __GNU_LIBRARY__ */

src/getopt.h

@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -141,7 +141,14 @@ struct option {
    arguments to the option '\0'.  This behavior is specific to the GNU
    `getopt'.  */
 
-#ifdef __GNU_LIBRARY__
+/* Check for musl C library (<bits/alltypes.h> is musl specific).  */
+#if !defined __GLIBC__ && __has_include(<bits/alltypes.h>)
+#ifndef __MUSL__
+#define __MUSL__ 1
+#endif
+#endif
+
+#if defined __GLIBC__ || defined __MUSL__
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */

test/data/cdda2.cue

@@ -1,7 +1,7 @@
 TITLE "Join us now we have the software"
 CATALOG 0000010271955
 PERFORMER "Richard Stallman"
-FILE "BOING.BIN" BINARY
+FILE "BOING2.BIN" BINARY
   TRACK 01 AUDIO
     FLAGS DCP
     INDEX 01 00:00:00