From ec73d3fe1f9c9915402817c09411223211f00a68 Mon Sep 17 00:00:00 2001
From: GravisZro <noreply+github@adaptivetime.com>
Date: Tue, 21 May 2024 09:48:01 -0400
Subject: [PATCH] Remove excess `stricmp` definitions

---
 czip/BitIO.cpp        | 17 +++++++++--------
 lib/Macros.h          |  1 -
 scripts/linux_lib.cpp |  2 --
 scripts/linux_lib.h   |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/czip/BitIO.cpp b/czip/BitIO.cpp
index 00d45fb8..d74e668d 100644
--- a/czip/BitIO.cpp
+++ b/czip/BitIO.cpp
@@ -34,17 +34,18 @@
  * $NoKeywords: $
  */
 
+#include <algorithm>
+#include <cstdio>
 #include <cstdint>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+
 #include <sys/stat.h>
 #include <errno.h>
 #include <Macros.h>
 #include "CZip.h"
 
-#include <algorithm>
-
 BITFILE *CZip::OpenInputBitFile(char *filename) {
   BITFILE *bit_file;
   bit_file = (BITFILE *)malloc(sizeof(BITFILE));
@@ -172,9 +173,9 @@ int CZip::InputBit(BITFILE *bfile) {
   return (value ? 1 : 0);
 }
 
-uint32_t CZip::InputBits(BITFILE *bfile, int bitcount) {
-  uint32_t mask;
-  uint32_t return_value;
+ulong CZip::InputBits(BITFILE *bfile, int bitcount) {
+  ulong mask;
+  ulong return_value;
 
   mask = 1L << (bitcount - 1);
   return_value = 0;
diff --git a/lib/Macros.h b/lib/Macros.h
index 32e97eb6..153ab43e 100644
--- a/lib/Macros.h
+++ b/lib/Macros.h
@@ -63,7 +63,6 @@
 #define CHECK_FLAG(_var, _flag) ((_var) & (_flag))
 
 #ifdef LINUX
-#define stricmp(a, b) strcasecmp(a, b)
 #define _stat stat
 #endif
 
diff --git a/scripts/linux_lib.cpp b/scripts/linux_lib.cpp
index 1d283b7a..8f064815 100644
--- a/scripts/linux_lib.cpp
+++ b/scripts/linux_lib.cpp
@@ -95,5 +95,3 @@ void _splitpath(const char *srcPath, char *drive, char *path, char *filename, ch
     }
   }
 }
-
-int stricmp(const char *string1, const char *string2) { return strcasecmp(string1, string2); }
diff --git a/scripts/linux_lib.h b/scripts/linux_lib.h
index 3afa74fe..7a01f8df 100644
--- a/scripts/linux_lib.h
+++ b/scripts/linux_lib.h
@@ -22,8 +22,8 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
+#include "linux/linux_fix.h"
 
 void _splitpath(const char *path, char *drive, char *dir, char *fname, char *ext);
-int stricmp(const char *string1, const char *string2);
 
 #endif