external libs/libmodplug: fixed watcom W007 warnings

libsdl-org · Nov 24, 2019 · 0d38f14 · 0d38f14
1 parent af2fad5
commit 0d38f14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/external/libmodplug-0.8.9.0/src/load_dbm.cpp b/external/libmodplug-0.8.9.0/src/load_dbm.cpp
@@ -249,7 +249,7 @@ BOOL CSoundFile::ReadDBM(const BYTE *lpStream, DWORD dwMemLength)
 					MODCOMMAND *m = AllocatePattern(nRows, m_nChannels);
 					if (m)
 					{
-						LPBYTE pkdata = (LPBYTE)&pph->patterndata;
+						LPBYTE pkdata = (LPBYTE)pph->patterndata;
 						UINT row = 0;
 						UINT i = 0;
 
@@ -365,4 +365,3 @@ BOOL CSoundFile::ReadDBM(const BYTE *lpStream, DWORD dwMemLength)
 	}
 	return TRUE;
 }
-
diff --git a/external/libmodplug-0.8.9.0/src/load_s3m.cpp b/external/libmodplug-0.8.9.0/src/load_s3m.cpp
@@ -301,7 +301,7 @@ BOOL CSoundFile::ReadS3M(const BYTE *lpStream, DWORD dwMemLength)
 		}
 		S3MSAMPLESTRUCT pSmp;
 		memcpy(&pSmp, lpStream+nInd, 0x50);
-		memcpy(Ins[iSmp].name, &pSmp.dosname, 12);
+		memcpy(Ins[iSmp].name, pSmp.dosname, 12);
 		insflags[iSmp-1] = pSmp.flags;
 		inspack[iSmp-1] = pSmp.pack;
 		memcpy(m_szNames[iSmp], pSmp.name, 28);