gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename all functions imported from musl

Browse Source 
This is to avoid conflicting with libraries, which occurred in the mingw builds
This commit is contained in:
ISSOtm
2019-11-23 23:07:39 +01:00
parent 68410d35d3
commit d93ad2e650
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/extern/getopt.h vendored
View File

@@ -36,7 +36,7 @@ struct option {
int val;
};
int getopt_long_only(int, char **, const char *, const struct option *, int *);
int musl_getopt_long_only(int, char **, const char *, const struct option *, int *);
#define no_argument 0
#define required_argument 1

4
src/asm/main.c
View File

@@ -317,8 +317,8 @@ int main(int argc, char *argv[])
newopt = CurrentOptions;
while ((ch = getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) {
while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) {
switch (ch) {
case 'b':
if (strlen(optarg) == 2) {

20
src/extern/getopt.c vendored
View File

@@ -33,7 +33,7 @@
int __optpos, __optreset;
void __getopt_msg(const char *a, const char *b, const char *c, size_t l)
void musl__getopt_msg(const char *a, const char *b, const char *c, size_t l)
{
FILE *f = stderr;
(void)(fputs(a, f)>=0
@@ -52,9 +52,9 @@ static void permute(char **argv, int dest, int src)
av[dest] = tmp;
}
static int __getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly);
static int musl__getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly);
static int __getopt_long(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
static int musl__getopt_long(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
{
int ret, skipped, resumed;
if (!optind || __optreset) {
@@ -73,7 +73,7 @@ static int __getopt_long(int argc, char **argv, const char *optstring, const str
optind = i;
}
resumed = optind;
ret = __getopt_long_core(argc, argv, optstring, longopts, idx, longonly);
ret = musl__getopt_long_core(argc, argv, optstring, longopts, idx, longonly);
if (resumed > skipped) {
int i, cnt = optind-resumed;
for (i=0; i<cnt; i++)
@@ -83,7 +83,7 @@ static int __getopt_long(int argc, char **argv, const char *optstring, const str
return ret;
}
static int __getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
static int musl__getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
{
optarg = 0;
if (longopts && argv[optind][0] == '-' &&
@@ -128,7 +128,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
optopt = longopts[i].val;
if (colon || !opterr)
return '?';
__getopt_msg(argv[0],
musl__getopt_msg(argv[0],
": option does not take an argument: ",
longopts[i].name,
strlen(longopts[i].name));
@@ -140,7 +140,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
optopt = longopts[i].val;
if (colon) return ':';
if (!opterr) return '?';
__getopt_msg(argv[0],
musl__getopt_msg(argv[0],
": option requires an argument: ",
longopts[i].name,
strlen(longopts[i].name));
@@ -158,7 +158,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
if (argv[optind][1] == '-') {
optopt = 0;
if (!colon && opterr)
__getopt_msg(argv[0], cnt ?
musl__getopt_msg(argv[0], cnt ?
": option is ambiguous: " :
": unrecognized option: ",
argv[optind]+2,
@@ -170,7 +170,7 @@ static int __getopt_long_core(int argc, char **argv, const char *optstring, cons
return getopt(argc, argv, optstring);
}
int getopt_long_only(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx)
int musl_getopt_long_only(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx)
{
return __getopt_long(argc, argv, optstring, longopts, idx, 1);
return musl__getopt_long(argc, argv, optstring, longopts, idx, 1);
}

4
src/fix/main.c
View File

@@ -98,8 +98,8 @@ int main(int argc, char *argv[])
int version = 0; /* mask ROM version number */
int padvalue = 0; /* to pad the rom with if it changes size */
while ((ch = getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) {
while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) {
switch (ch) {
case 'C':
coloronly = true;

4
src/gfx/main.c
View File

@@ -80,8 +80,8 @@ int main(int argc, char *argv[])
depth = 2;
while ((ch = getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) {
while ((ch = musl_getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) {
switch (ch) {
case 'A':
opts.attrmapout = true;

4
src/link/main.c
View File

@@ -102,8 +102,8 @@ int main(int argc, char *argv[])
unsigned long value; /* For storing `strtoul`'s return value */
/* Parse options */
while ((optionChar = getopt_long_only(argc, argv, optstring, longopts,
NULL)) != -1) {
while ((optionChar = musl_getopt_long_only(argc, argv, optstring,
longopts, NULL)) != -1) {
switch (optionChar) {
case 'd':
isDmgMode = true;