[Scummvm-git-logs] scummvm master -> 9b0f0eb1afff44a15b766d4e2e230e95a753f9d8

[sev-]

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:
9b0f0eb1af CODESTYLE: remove C++ headers, use int64 instead __int64_t.


Commit: 9b0f0eb1afff44a15b766d4e2e230e95a753f9d8
    https://github.com/scummvm/scummvm/commit/9b0f0eb1afff44a15b766d4e2e230e95a753f9d8
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-02-26T19:29:33+01:00

Commit Message:
CODESTYLE: remove C++ headers, use int64 instead __int64_t.

Changed paths:
    engines/cryo/debugger.cpp
    engines/icb/common/px_string.h
    engines/icb/jpeg.h


diff --git a/engines/cryo/debugger.cpp b/engines/cryo/debugger.cpp
index f19c616b72..efb407b7db 100644
--- a/engines/cryo/debugger.cpp
+++ b/engines/cryo/debugger.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "common/coroutines.h"
 #include "cryo/debugger.h"
 #include "cryo/cryo.h"
 
diff --git a/engines/icb/common/px_string.h b/engines/icb/common/px_string.h
index 02dc5f8add..c2f2953892 100644
--- a/engines/icb/common/px_string.h
+++ b/engines/icb/common/px_string.h
@@ -28,8 +28,6 @@
 #ifndef ICB_PX_STRING_H
 #define ICB_PX_STRING_H
 
-#include <cstring>
-
 #include "engines/icb/common/px_rccommon.h"
 #include "engines/icb/common/px_rcutypes.h"
 
diff --git a/engines/icb/jpeg.h b/engines/icb/jpeg.h
index 6c0f57bd09..8b8a22abbf 100644
--- a/engines/icb/jpeg.h
+++ b/engines/icb/jpeg.h
@@ -41,7 +41,7 @@ static uint32 *_end_buf;
 #ifdef _WIN32
 static __int64 safeMM0 = 0;
 #else
-static __int64_t safeMM0 = 0;
+static int64 safeMM0 = 0;
 #endif
 
 const int JpegMaxHuffmanTables = 4;