BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

master #5

Merged
BRNSystems merged 45 commits from Mirrorlandia_minetest/irrlicht:master into master 2024-02-27 13:26:18 +01:00
Conversation 0 Commits 45 Files Changed 188 +2 -8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ddf740f9b - Show all commits

2
include/IrrCompileConfig.h
View File

@ -17,8 +17,6 @@
#define IRRLICHT_VERSION_SVN alpha #define IRRLICHT_VERSION_SVN alpha
#define IRRLICHT_SDK_VERSION "1.9.0" IRRLICHT_VERSION_MT #define IRRLICHT_SDK_VERSION "1.9.0" IRRLICHT_VERSION_MT
#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
#ifdef _WIN32 #ifdef _WIN32
#define IRRCALLCONV __stdcall #define IRRCALLCONV __stdcall
#else #else

8
include/irrTypes.h
View File

@ -56,23 +56,19 @@ typedef double f64;
} // end namespace irr } // end namespace irr
#include <wchar.h> //! Defines for snprintf_irr because snprintf method does not match the ISO C
//! Defines for s{w,n}printf_irr because s{w,n}printf methods do not match the ISO C
//! standard on Windows platforms. //! standard on Windows platforms.
//! We want int snprintf_irr(char *str, size_t size, const char *format, ...); //! We want int snprintf_irr(char *str, size_t size, const char *format, ...);
//! and int swprintf_irr(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define swprintf_irr swprintf_s
#define snprintf_irr sprintf_s #define snprintf_irr sprintf_s
#else #else
#define swprintf_irr swprintf
#define snprintf_irr snprintf #define snprintf_irr snprintf
#endif // _MSC_VER #endif // _MSC_VER
namespace irr namespace irr
{ {
//! Type name for character type used by the file system. //! Type name for character type used by the file system (legacy).
typedef char fschar_t; typedef char fschar_t;
#define _IRR_TEXT(X) X #define _IRR_TEXT(X) X