shithub: rgbds

Info  •  Files  •  Log  •  Branches

Rename all functions imported from musl
This is to avoid conflicting with libraries, which occurred in the mingw builds

--- a/include/extern/getopt.h

+++ b/include/extern/getopt.h

@@ -36,7 +36,7 @@

 	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

--- a/src/asm/main.c

+++ b/src/asm/main.c

@@ -317,8 +317,8 @@

 	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) {

--- a/src/extern/getopt.c

+++ b/src/extern/getopt.c

@@ -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 @@

 	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 @@

 		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 @@

 	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 @@

 					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 @@

 					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 @@

 		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 @@

 	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);

 }

--- a/src/fix/main.c

+++ b/src/fix/main.c

@@ -98,8 +98,8 @@

 	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;

--- a/src/gfx/main.c

+++ b/src/gfx/main.c

@@ -80,8 +80,8 @@

 	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;

--- a/src/link/main.c

+++ b/src/link/main.c

@@ -102,8 +102,8 @@

 	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;