Fix conflicting declaration of basename function

carlbennett · carlbennett · commit 56e4a3104dd6 · 2016-07-01T05:18:32.000Z
error: conflicting declaration of ‘const char* basename(const char*)’
with ‘C’ linkage
diff --git a/src/bncsutil/checkrevision.cpp b/src/bncsutil/checkrevision.cpp
@@ -124,6 +124,7 @@ MEXP(int) extractMPQNumber(const char* mpqName)
     return mpqNum;
 }
 
+#if !__GNUC__
 const char* basename(const char* file_name)
 {
     const char* base;
@@ -135,6 +136,7 @@ const char* basename(const char* file_name)
 
     return ++base;
 }
+#endif
 
 MEXP(int) checkRevision(const char* formula, const char* files[], int numFiles,
     int mpqNumber, unsigned long* checksum)

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ MEXP(int) extractMPQNumber(const char* mpqName)`
`124`	`124`	`return mpqNum;`
`125`	`125`	`}`
`126`	`126`
	`127`	`+#if !__GNUC__`
`127`	`128`	`const char* basename(const char* file_name)`
`128`	`129`	`{`
`129`	`130`	`const char* base;`
`@@ -135,6 +136,7 @@ const char* basename(const char* file_name)`
`135`	`136`
`136`	`137`	`return ++base;`
`137`	`138`	`}`
	`139`	`+#endif`
`138`	`140`
`139`	`141`	`MEXP(int) checkRevision(const char* formula, const char* files[], int numFiles,`
`140`	`142`	`int mpqNumber, unsigned long* checksum)`