[Nokia N-Gage] Remove redundant code after cleaning up the native Sym…

…bian API, this fixes several compiler warnings.
libsdl-org · Feb 8, 2025 · 228124c · 228124c
1 parent f9f83e5
commit 228124c
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 46 deletions.
diff --git a/src/SDL.c b/src/SDL.c
@@ -93,10 +93,7 @@ SDL_COMPILE_TIME_ASSERT(SDL_MICRO_VERSION_max, SDL_MICRO_VERSION <= 999);
 extern SDL_NORETURN void SDL_ExitProcess(int exitcode);
 SDL_NORETURN void SDL_ExitProcess(int exitcode)
 {
-#if defined(SDL_PLATFORM_NGAGE)
-    extern void NGAGE_ExitApp(int exitcode);
-    NGAGE_ExitApp(exitcode);
-#elif defined(SDL_PLATFORM_WINDOWS)
+#if defined(SDL_PLATFORM_WINDOWS)
     /* "if you do not know the state of all threads in your process, it is
        better to call TerminateProcess than ExitProcess"
        https://msdn.microsoft.com/en-us/library/windows/desktop/ms682658(v=vs.85).aspx */

diff --git a/src/audio/ngage/SDL_ngageaudio.cpp b/src/audio/ngage/SDL_ngageaudio.cpp
@@ -242,7 +242,6 @@ TInt CAudio::ProcessThreadCB(TAny* aPtr)
     {
         if (device)
         {
-            SDL_PrivateAudioData* phdata = (SDL_PrivateAudioData*)device->hidden;
             SDL_PlaybackAudioThreadIterate(device);
         }
         else
@@ -355,7 +354,8 @@ TInt AudioThreadCB(TAny* aParams)
             while (gAudioRunning)
             {
                 // Allow active scheduler to process any events.
-                CActiveScheduler::RunIfReady(0, CActive::EPriorityIdle);
+                TInt error;
+                CActiveScheduler::RunIfReady(error, CActive::EPriorityIdle);
 
                 if (!once)
                 {

diff --git a/src/core/ngage/SDL_ngage.cpp b/src/core/ngage/SDL_ngage.cpp
@@ -20,10 +20,6 @@
 */
 #include "SDL_internal.h"
 
-#ifdef NULL
-#undef NULL
-#endif
-
 #include <e32std.h>
 #include <e32svr.h>
 #include <hal.h>
@@ -32,11 +28,6 @@
 extern "C" {
 #endif
 
-void NGAGE_ExitApp(int exitcode)
-{
-    User::Exit(exitcode);
-}
-
 bool NGAGE_IsClassicModel()
 {
     int phone_id;

diff --git a/src/filesystem/ngage/SDL_sysfilesystem.cpp b/src/filesystem/ngage/SDL_sysfilesystem.cpp
@@ -28,10 +28,6 @@ extern "C" {
 }
 #endif
 
-#ifdef NULL
-#undef NULL
-#endif
-
 #include <e32base.h>
 #include <e32std.h>
 #include <f32file.h>

diff --git a/src/locale/ngage/SDL_syslocale.cpp b/src/locale/ngage/SDL_syslocale.cpp
@@ -21,10 +21,6 @@
 #include "SDL_internal.h"
 #include "../SDL_syslocale.h"
 
-#ifdef NULL
-#undef NULL
-#endif
-
 #include <e32std.h>
 #include <bautils.h>
 #include <e32base.h>

diff --git a/src/main/ngage/SDL_sysmain_main.cpp b/src/main/ngage/SDL_sysmain_main.cpp
@@ -28,10 +28,6 @@ extern "C" {
 }
 #endif
 
-#ifdef NULL
-#undef NULL
-#endif
-
 #include <e32std.h>
 #include <estlib.h>
 #include <stdlib.h>

diff --git a/src/render/ngage/SDL_render_ngage.c b/src/render/ngage/SDL_render_ngage.c
@@ -22,6 +22,26 @@
 
 #ifdef SDL_VIDEO_RENDER_NGAGE
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#ifndef Int2Fix
+#define Int2Fix(i) ((i)<<16)
+#endif
+
+#ifndef Fix2Int
+#define Fix2Int(i) ((((unsigned int)(i)>0xFFFF0000)?0:((i)>>16)))
+#endif
+
+#ifndef Fix2Real
+#define Fix2Real(i) ((i)/65536.0)
+#endif
+
+#ifndef Real2Fix
+#define Real2Fix(i) ((int)((i)*65536.0))
+#endif
+
 #include "SDL_render_ngage_c.h"
 #include "../SDL_sysrender.h"
 

diff --git a/src/render/ngage/SDL_render_ngage_c.h b/src/render/ngage/SDL_render_ngage_c.h
@@ -31,12 +31,6 @@ extern "C" {
 
 #include "../SDL_sysrender.h"
 
-#define M_PI 3.14159265358979323846
-#define Int2Fix(i) ((i)<<16)
-#define Fix2Int(i) ((((unsigned int)(i)>0xFFFF0000)?0:((i)>>16)))
-#define Fix2Real(i) ((i)/65536.0)
-#define Real2Fix(i) ((int)((i)*65536.0))
-
     typedef struct NGAGE_RendererData
     {
         SDL_Rect* viewport;

diff --git a/src/render/ngage/SDL_render_ngage_c.hpp b/src/render/ngage/SDL_render_ngage_c.hpp
@@ -31,7 +31,7 @@ class CRenderer: public MDirectScreenAccess
 {
 public:
     static CRenderer* NewL();
-    ~CRenderer();
+    virtual ~CRenderer();
 
     // Rendering functions.
     void Clear(TUint32 iColor);

diff --git a/src/render/ngage/SDL_render_ops.cpp b/src/render/ngage/SDL_render_ops.cpp
@@ -20,6 +20,7 @@
 */
 #include "SDL_internal.h"
 
+#include <3dtypes.h>
 #include "SDL_render_ops.hpp"
 
 void ApplyColorMod(void *dest, void *source, int pitch, int width, int height, SDL_FColor color)

diff --git a/src/time/ngage/SDL_systime.cpp b/src/time/ngage/SDL_systime.cpp
@@ -20,10 +20,6 @@
 */
 #include "SDL_internal.h"
 
-#ifdef NULL
-#undef NULL
-#endif
-
 #include <bautils.h>
 #include <e32base.h>
 #include <e32cons.h>

diff --git a/src/timer/ngage/SDL_systimer.cpp b/src/timer/ngage/SDL_systimer.cpp
@@ -20,10 +20,6 @@
 */
 #include "SDL_internal.h"
 
-#ifdef NULL
-#undef NULL
-#endif
-
 #include <e32std.h>
 #include <e32hal.h>
 

diff --git a/src/video/ngage/SDL_ngagevideo.h b/src/video/ngage/SDL_ngagevideo.h
@@ -27,10 +27,6 @@
 #ifndef _SDL_ngagevideo_h
 #define _SDL_ngagevideo_h
 
-#ifdef NULL
-#undef NULL
-#endif
-
 typedef struct SDL_VideoData
 {
     SDL_DisplayMode mode;