mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-23 10:11:58 +00:00
Tried compiling with ICC9 on Linux, which raised various issues:
* Fixed some bugs with incorrect macro usage (SDL_BYTE_ORDER vs
SDL_BYTEORDER, {MSC,GCC}_VER vs {MSC,GCC}_VERSION, OS_WIN/OS_UNIX in
projects where they're not defined).
* Removed some redundant declarations of g_Console.
* Removed some unnecessary semicolons.
* Removed some unused variables.
* Added throw specification to operator new.
This was SVN commit r4698.
This commit is contained in:
@@ -2,9 +2,10 @@
|
||||
|
||||
#include "StringConvert.h"
|
||||
#include "lib/types.h"
|
||||
#include "lib/sdl.h"
|
||||
#include "scripting/SpiderMonkey.h"
|
||||
|
||||
#if SDL_BYTE_ORDER == SDL_BIG_ENDIAN
|
||||
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
|
||||
#define ucs2le_to_wchart(ptr) (wchar_t)( (u16) ((u8*)ptr)[0] | (u16) ( ((u8*)ptr)[1] << 8) )
|
||||
#else
|
||||
#define ucs2le_to_wchart(ptr) (wchar_t)(*ptr);
|
||||
|
||||
Reference in New Issue
Block a user