q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ptitSeb/Serious-Engine

Browse Source 
Conflicts:
	Sources/Engine/Base/Types.h
	Sources/Engine/Engine.h
This commit is contained in:
ptitSeb 2016-04-22 23:04:19 +02:00
commit dca5b7a6ac
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Engine/Base/Types.h
View File

@ -78,7 +78,6 @@ typedef uint32_t UINT;
#error "Unknown CPU-Architecture, adapt this code to detect 32/64bitness of your system!" #error "Unknown CPU-Architecture, adapt this code to detect 32/64bitness of your system!"
#endif #endif
// if the compiler complains about the typedef created by MY_STATIC_ASSERT being invalid // if the compiler complains about the typedef created by MY_STATIC_ASSERT being invalid
// (because of array with negative size), it means the check for cond has failed // (because of array with negative size), it means the check for cond has failed
#define MY_STATIC_ASSERT(namesuffx, cond) \ #define MY_STATIC_ASSERT(namesuffx, cond) \