From 930274bbfcb3538237d1fe6a128b1d26aefb3188 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 10 Apr 2022 04:21:56 +0300
Subject: [PATCH] minor update to external libs/modplug
---
external/libmodplug-0.8.9.0/src/libmodplug/sndfile.h | 3 ++-
external/libmodplug-0.8.9.0/src/libmodplug/stdafx.h | 2 --
external/libmodplug-0.8.9.0/src/load_amf.cpp | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/external/libmodplug-0.8.9.0/src/libmodplug/sndfile.h b/external/libmodplug-0.8.9.0/src/libmodplug/sndfile.h
index 696783f5..8e93be30 100644
--- a/external/libmodplug-0.8.9.0/src/libmodplug/sndfile.h
+++ b/external/libmodplug-0.8.9.0/src/libmodplug/sndfile.h
@@ -17,7 +17,8 @@
int _strnicmp(const char *str1,const char *str2, int n);
#endif
-#ifndef LPCBYTE
+#ifndef _LPCBYTE_DEFINED
+#define _LPCBYTE_DEFINED
typedef const BYTE * LPCBYTE;
#endif
diff --git a/external/libmodplug-0.8.9.0/src/libmodplug/stdafx.h b/external/libmodplug-0.8.9.0/src/libmodplug/stdafx.h
index 919c1b00..5c7be05d 100644
--- a/external/libmodplug-0.8.9.0/src/libmodplug/stdafx.h
+++ b/external/libmodplug-0.8.9.0/src/libmodplug/stdafx.h
@@ -98,10 +98,8 @@ typedef const char* LPCSTR;
typedef void* PVOID;
typedef void VOID;
-#define LPCTSTR LPCSTR
#define lstrcpyn strncpy
#define lstrcpy strcpy
-#define lstrcmp strcmp
#define wsprintf sprintf
#define WAVE_FORMAT_PCM 1
diff --git a/external/libmodplug-0.8.9.0/src/load_amf.cpp b/external/libmodplug-0.8.9.0/src/load_amf.cpp
index 871be58c..e7916711 100644
--- a/external/libmodplug-0.8.9.0/src/load_amf.cpp
+++ b/external/libmodplug-0.8.9.0/src/load_amf.cpp
@@ -169,7 +169,7 @@ BOOL CSoundFile::ReadAMF(LPCBYTE lpStream, const DWORD dwMemLength)
DWORD dwMemPos;
if ((!lpStream) || (dwMemLength < 2048)) return FALSE;
- if ((!strncmp((LPCTSTR)lpStream, "ASYLUM Music Format V1.0", 25)) && (dwMemLength > 4096))
+ if ((!strncmp((LPCSTR)lpStream, "ASYLUM Music Format V1.0", 25)) && (dwMemLength > 4096))
{
UINT numorders, numpats, numsamples;