[Scummvm-git-logs] scummvm branch-2-7 -> 558c597aade7c0db5d2b862dbb0635b8fba62ccb

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
558c597aad SAGA2: Drop unused swap16()/swap32()


Commit: 558c597aade7c0db5d2b862dbb0635b8fba62ccb
    https://github.com/scummvm/scummvm/commit/558c597aade7c0db5d2b862dbb0635b8fba62ccb
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-02-15T12:47:36+01:00

Commit Message:
SAGA2: Drop unused swap16()/swap32()

They're unused and they cause a build failure on OpenBSD, which already
has swap16()/swap32() macros in its system headers.

(cherry picked from commit d2f79413e322f386429a7e16934e6a331fa8eeb8)

Changed paths:
    engines/saga2/cmisc.h


diff --git a/engines/saga2/cmisc.h b/engines/saga2/cmisc.h
index 40ad2d087fa..4ede8c26a7d 100644
--- a/engines/saga2/cmisc.h
+++ b/engines/saga2/cmisc.h
@@ -34,19 +34,6 @@ int32 clamp(int32 lowerLimit, int32 num, int32 upperLimit);
 //  Converts x/y point to angle + distance
 int16 ptToAngle(int16 dx, int16 dy, int16 *dist = NULL);
 
-//  Byte-swap a 16-bit integer
-inline int16 swap16(uint16 w) {
-	return (w >>  8) | (w <<  8);
-}
-
-//  Byte-swap a 32-bit integer
-inline int32 swap32(int32 l) {
-	return ((l >> 24) & 0x000000ffL) |
-	       ((l >>  8) & 0x0000ff00L) |
-	       ((l <<  8) & 0x00ff0000L) |
-	       ((l << 24) & 0xff000000L);
-}
-
 #if     defined( USEWINDOWS )
 inline void delay(int32 ms)        {
 	Sleep(ms);