From d93ad2e650282ddc211aedb28fe0bc10aec2f23b Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Sat, 23 Nov 2019 23:07:39 +0100
Subject: [PATCH] Rename all functions imported from musl This is to avoid
 conflicting with libraries, which occurred in the mingw builds

---
 include/extern/getopt.h |  2 +-
 src/asm/main.c          |  4 ++--
 src/extern/getopt.c     | 20 ++++++++++----------
 src/fix/main.c          |  4 ++--
 src/gfx/main.c          |  4 ++--
 src/link/main.c         |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/extern/getopt.h b/include/extern/getopt.h
index 5eab2968..4eead270 100644
--- a/include/extern/getopt.h
+++ b/include/extern/getopt.h
@@ -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
diff --git a/src/asm/main.c b/src/asm/main.c
index 2962536e..03c1db46 100644
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -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) {
diff --git a/src/extern/getopt.c b/src/extern/getopt.c
index 834ad4e9..118fd11d 100644
--- 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 @@ 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);
 }
diff --git a/src/fix/main.c b/src/fix/main.c
index addc0718..8ef748d3 100644
--- a/src/fix/main.c
+++ b/src/fix/main.c
@@ -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;
diff --git a/src/gfx/main.c b/src/gfx/main.c
index 5238c911..9ac07760 100644
--- a/src/gfx/main.c
+++ b/src/gfx/main.c
@@ -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;
diff --git a/src/link/main.c b/src/link/main.c
index d94710e3..22afdcbd 100644
--- a/src/link/main.c
+++ b/src/link/main.c
@@ -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;