Skip to content

fix C23 compatibility for getenv/getopt prototypes #97

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

Open
codingWiz-rick wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix C23 compatibility for getenv/getopt prototypes #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions src/getopt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ struct option
errors, only prototype getopt for the GNU C library. */
extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
# else /* not __GNU_LIBRARY__ */
extern int getopt ();
extern int getopt (int argc, char * const argv[], const char *shortopts);
# endif /* __GNU_LIBRARY__ */

# ifndef __need_getopt
Expand All @@ -161,12 +161,18 @@ extern int _getopt_internal (int __argc, char *const *__argv,
int __long_only);
# endif
#else /* not __STDC__ */
extern int getopt ();
extern int getopt (int argc, char * const argv[], const char *shortopts);
# ifndef __need_getopt
extern int getopt_long ();
extern int getopt_long_only ();
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
extern int getopt_long_only (int argc, char *const *argv,
const char *shortopts,
const struct option *longopts, int *longind);

extern int _getopt_internal ();
extern int _getopt_internal (int __argc, char *const *__argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only);
# endif
#endif /* __STDC__ */

Expand Down
2 changes: 1 addition & 1 deletion src/getopt_long.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static char *posixly_correct;
whose names are inconsistent. */

#ifndef getenv
extern char *getenv ();
extern char *getenv (const char *name);
#endif

static char *
Expand Down