Skip to content

GCC 15 tolerance #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rocky merged 3 commits into from
Oct 7, 2025
Merged

GCC 15 tolerance #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c12e48e
Remove a GCC-15 error on getopt.c
rocky Oct 1, 2025
67b7ffa
Newer libcdio respects file name in CUE file
rocky Oct 1, 2025
dbde3c2
Make clang-formatter compliant
rocky Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/getopt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 drepper@gnu.org
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
Expand Down Expand Up @@ -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__ */
Expand Down
11 changes: 9 additions & 2 deletions src/getopt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion test/data/cdda2.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Collaborator Author

@rocky rocky Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't strictly needed for this PR, but it doesn't hurt either.

We will need another PR to deal with the fact that the current libcdio changes the way CUE's work. In the current libcdio master branch, the name inside the CUE file is now respected, and we have both cdda2.cue and cdda.cue referring to the same BIN name, even tough the cdda.bin and cdda2.bin (the old locations of these files) are different.

TRACK 01 AUDIO
FLAGS DCP
INDEX 01 00:00:00