[Scummvm-git-logs] scummvm master -> 5f64d817b86ea316aca5ab8de0036ec660781d6e

digitall dgturner at iee.org
Sun Jan 14 07:49:59 CET 2018


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

Summary:
dc1d9e2d65 SYMBIAN: Hide warnings from system headers
c0c186d001 SYMBIAN: Add missed brace
5f64d817b8 SYMBIAN: Set install version to 2.0.0


Commit: dc1d9e2d6521aea75b69c03051c73b5cac9180f8
    https://github.com/scummvm/scummvm/commit/dc1d9e2d6521aea75b69c03051c73b5cac9180f8
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2018-01-14T06:49:54Z

Commit Message:
SYMBIAN: Hide warnings from system headers

Changed paths:
    backends/platform/symbian/src/portdefs.h


diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index f9e0d04..7729145 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -30,9 +30,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <e32def.h>
 
+#if (__GNUC__ && __cplusplus)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wreturn-local-addr"
+#endif
+#include <e32def.h>
 #include <e32std.h>
+#if (__GNUC__ && __cplusplus)
+#pragma GCC diagnostic pop
+#endif
+
 #include <libc\math.h>
 
 /* define pi */
@@ -53,6 +61,17 @@ typedef unsigned short int uint16;
 typedef signed short int int16;
 typedef unsigned long int uint32;
 typedef signed long int int32;
+typedef signed long long int64;
+typedef unsigned long long uint64;
+
+#ifdef __cplusplus
+namespace std
+	{
+
+	using ::size_t;
+
+	} // namespace std
+#endif
 
 // Define SCUMMVM_DONT_DEFINE_TYPES to prevent scummsys.h from trying to
 // re-define those data types.


Commit: c0c186d0012187b1534dc1c4a1c202c3c6f6abcf
    https://github.com/scummvm/scummvm/commit/c0c186d0012187b1534dc1c4a1c202c3c6f6abcf
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2018-01-14T06:49:54Z

Commit Message:
SYMBIAN: Add missed brace

Changed paths:
    backends/events/symbiansdl/symbiansdl-events.cpp


diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp
index 0ae5824..fde748f 100644
--- a/backends/events/symbiansdl/symbiansdl-events.cpp
+++ b/backends/events/symbiansdl/symbiansdl-events.cpp
@@ -124,7 +124,7 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				if (ev.type == SDL_KEYDOWN) {
 					for (int i = 0; i < TOTAL_ZONES; i++)
 						if ( (_km.x / MULTIPLIER) >= _zones[i].x && (_km.y / MULTIPLIER) >= _zones[i].y &&
-							(_km.x / MULTIPLIER) <= _zones[i].x + _zones[i].width && (_km.y / MULTIPLIER <= _zones[i].y + _zones[i].height
+							(_km.x / MULTIPLIER) <= _zones[i].x + _zones[i].width && (_km.y / MULTIPLIER <= _zones[i].y + _zones[i].height)
 							) {
 							_mouseXZone[i] = _km.x / MULTIPLIER;
 							_mouseYZone[i] = _km.y / MULTIPLIER;


Commit: 5f64d817b86ea316aca5ab8de0036ec660781d6e
    https://github.com/scummvm/scummvm/commit/5f64d817b86ea316aca5ab8de0036ec660781d6e
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2018-01-14T06:49:54Z

Commit Message:
SYMBIAN: Set install version to 2.0.0

Changed paths:
    backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg


diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 30d2aa3..7dc58f4 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -33,7 +33,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),1,80,0
+#{"ScummVM S60v3"},(0xA0000657),2,00,0
 
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}





More information about the Scummvm-git-logs mailing list