[Scummvm-git-logs] scummvm master -> 853af7a8a6ed3887aa7989c86e784f36c87c68c8

[lephilousophe]

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

Summary:
853af7a8a6 AGS: Move include for wchar.h before scummsys.h


Commit: 853af7a8a6ed3887aa7989c86e784f36c87c68c8
    https://github.com/scummvm/scummvm/commit/853af7a8a6ed3887aa7989c86e784f36c87c68c8
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2026-09-06T11:48:30+02:00

Commit Message:
AGS: Move include for wchar.h before scummsys.h

This is done to avoid symbol exception clutter

New updates in msys2/mingw64 (header io.h) would now otherwise require additional symbol exceptions for mkdir(), chdir() and getcwd() because those get pulled too with the <wchar.h> inclusion. Moving the file before scummsys.h removes the need for maintaining the symbol exceptions specific to this inclusion.

Changed paths:
    engines/ags/lib/alfont/alfont.cpp


diff --git a/engines/ags/lib/alfont/alfont.cpp b/engines/ags/lib/alfont/alfont.cpp
index f9e657dac59..b44ee36b110 100644
--- a/engines/ags/lib/alfont/alfont.cpp
+++ b/engines/ags/lib/alfont/alfont.cpp
@@ -24,25 +24,15 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_strcpy
 #define FORBIDDEN_SYMBOL_EXCEPTION_strcat
 
-// Following are pulled in for wchar.h header on XCode iOS-7
-#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
-#define FORBIDDEN_SYMBOL_EXCEPTION_fgetwc
-#define FORBIDDEN_SYMBOL_EXCEPTION_fgetws
-#define FORBIDDEN_SYMBOL_EXCEPTION_asctime
-#define FORBIDDEN_SYMBOL_EXCEPTION_clock
-#define FORBIDDEN_SYMBOL_EXCEPTION_ctime
-#define FORBIDDEN_SYMBOL_EXCEPTION_difftime
-#define FORBIDDEN_SYMBOL_EXCEPTION_getdate
-#define FORBIDDEN_SYMBOL_EXCEPTION_gmtime
-#define FORBIDDEN_SYMBOL_EXCEPTION_localtime
-#define FORBIDDEN_SYMBOL_EXCEPTION_mktime
-#define FORBIDDEN_SYMBOL_EXCEPTION_time
+// <wchar.h> is included here directly, because it's required for wcslen() on some platforms.
+// It is included before scummsys.h, to avoid clutter with symbol exceptions for forbidden symbols
+// that are pulled due this inclusion in some toolchains (eg. XCode iOS-7, MinGW-w64)
+#include <wchar.h>
 
 #include "common/scummsys.h"
 
 #ifdef USE_FREETYPE2
 
-#include <wchar.h>
 #include "ags/lib/alfont/alfont.h"
 #include "ags/lib/allegro/color.h"
 #include "ags/lib/allegro/draw.h"