Rename brk' to _brk' to avoid polluting the namespace

This commit is contained in:
sin 2013-11-11 20:25:30 +00:00
parent 3f9e501f6b
commit 7add068ade

12
arg.h
View File

@ -15,14 +15,14 @@ extern char *argv0;
argc--, argv++) {\ argc--, argv++) {\
char _argc;\ char _argc;\
char **_argv;\ char **_argv;\
int brk;\ int _brk;\
if (argv[0][1] == '-' && argv[0][2] == '\0') {\ if (argv[0][1] == '-' && argv[0][2] == '\0') {\
argv++;\ argv++;\
argc--;\ argc--;\
break;\ break;\
}\ }\
for (brk = 0, argv[0]++, _argv = argv;\ for (_brk = 0, argv[0]++, _argv = argv;\
argv[0][0] && !brk;\ argv[0][0] && !_brk;\
argv[0]++) {\ argv[0]++) {\
if (_argv != argv)\ if (_argv != argv)\
break;\ break;\
@ -46,17 +46,17 @@ extern char *argv0;
#define ARGC() _argc #define ARGC() _argc
#define ARGNUMF(base) (brk = 1, estrtol(argv[0], (base))) #define ARGNUMF(base) (_brk = 1, estrtol(argv[0], (base)))
#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ #define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
((x), abort(), (char *)0) :\ ((x), abort(), (char *)0) :\
(brk = 1, (argv[0][1] != '\0')?\ (_brk = 1, (argv[0][1] != '\0')?\
(&argv[0][1]) :\ (&argv[0][1]) :\
(argc--, argv++, argv[0]))) (argc--, argv++, argv[0])))
#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ #define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\
(char *)0 :\ (char *)0 :\
(brk = 1, (argv[0][1] != '\0')?\ (_brk = 1, (argv[0][1] != '\0')?\
(&argv[0][1]) :\ (&argv[0][1]) :\
(argc--, argv++, argv[0]))) (argc--, argv++, argv[0])))