about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2022-08-23 21:16:39 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2022-08-23 21:58:39 -0700
commit464138e90497be474fdbb19eebc0269ea24c5ce1 (patch)
tree9531e057a3ffdb842bc062f1c2e81c8121f5c0b7
parent8995b84c45e82c461bfcce34fff63c8e4e0b2aea (diff)
downloadglibc-464138e90497be474fdbb19eebc0269ea24c5ce1.tar.gz
glibc-464138e90497be474fdbb19eebc0269ea24c5ce1.tar.xz
glibc-464138e90497be474fdbb19eebc0269ea24c5ce1.zip
Merge _GL_UNUSED C23 patch from Gnulib
* posix/getopt.c (_getopt_initialize):
* sysdeps/posix/tempname.c (try_dir, try_nocreate):
Put _GL_UNUSED before args instead of after.
This makes no difference for glibc.
It is needed for Gnulib when being compiled on
non-GCC C23 compilers.
-rw-r--r--posix/getopt.c4
-rw-r--r--sysdeps/posix/tempname.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/posix/getopt.c b/posix/getopt.c
index e9661c79fa..a160a4e3bd 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -377,8 +377,8 @@ process_long_option (int argc, char **argv, const char *optstring,
 /* Initialize internal data upon the first call to getopt.  */
 
 static const char *
-_getopt_initialize (int argc _GL_UNUSED,
-		    char **argv _GL_UNUSED, const char *optstring,
+_getopt_initialize (_GL_UNUSED int argc,
+		    _GL_UNUSED char **argv, const char *optstring,
 		    struct _getopt_data *d, int posixly_correct)
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0
diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
index ebd2a43951..60f8541085 100644
--- a/sysdeps/posix/tempname.c
+++ b/sysdeps/posix/tempname.c
@@ -181,13 +181,13 @@ try_file (char *tmpl, void *flags)
 }
 
 static int
-try_dir (char *tmpl, void *flags _GL_UNUSED)
+try_dir (char *tmpl, _GL_UNUSED void *flags)
 {
   return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
 }
 
 static int
-try_nocreate (char *tmpl, void *flags _GL_UNUSED)
+try_nocreate (char *tmpl, _GL_UNUSED void *flags)
 {
   struct_stat64 st;