diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-08 20:41:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-08 20:48:44 -0700 |
| commit | c383c570c67e0ede0d3aa0ce08961d5745e7764d (patch) | |
| tree | dd317d4b4e860df3518ee1cf48852ec3609a21b6 /src/coreutils.c | |
| parent | 8defcee49be881f8c7b8327f07b988fbe5c7171d (diff) | |
| download | coreutils-c383c570c67e0ede0d3aa0ce08961d5745e7764d.tar.xz | |
maint: avoid file-scope names of the form _[a-z]*
The C standard says this isn't portable, if you include
standard include files.
* build-aux/gen-single-binary.sh:
* src/coreutils-arch.c (single_binary_main_arch)
(single_binary_main_uname):
* src/coreutils-dir.c (single_binary_main_ls)
(_single_binary_main_dir):
* src/coreutils-vdir.c (single_binary_main_ls)
(_single_binary_main_vdir):
* src/coreutils.c (SINGLE_BINARY_PROGRAM):
Remove leading _ from single_binary prefix.
* src/numfmt.c (round_style): Rename from _round. All uses changed.
(inval_style): Rename from _invalid. All uses changed.
Diffstat (limited to 'src/coreutils.c')
| -rw-r--r-- | src/coreutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coreutils.c b/src/coreutils.c index 898fe8413..57dc784a8 100644 --- a/src/coreutils.c +++ b/src/coreutils.c @@ -35,7 +35,7 @@ needs to match the one passed as CFLAGS on single-binary.mk (generated by gen-single-binary.sh). */ # define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \ - int _single_binary_main_##main_name (int, char **); + int single_binary_main_##main_name (int, char **); # include "coreutils.h" # undef SINGLE_BINARY_PROGRAM #endif @@ -103,7 +103,7 @@ launch_program (const char *prog_name, int prog_argc, char **prog_argv) /* Look up the right main program. */ # define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \ else if (STREQ (prog_name_str, prog_name)) \ - prog_main = _single_binary_main_##main_name; + prog_main = single_binary_main_##main_name; # include "coreutils.h" # undef SINGLE_BINARY_PROGRAM #endif |