Skip to content

Commit 9bbebfc

Browse files
committed
[fix] toolchain: Abstract compiler capabilities
Fixes various typos from the commit titled 'toolchain: Abstract compiler capabilities' Signed-off-by: Peter Mitsis <peter.mitsis@gmail.com>
1 parent 002dc3a commit 9bbebfc

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

code/globalincs/toolchain/clang.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
# define Assertion(expr, msg, ...) \
4242
do { \
4343
if (!(expr)) { \
44-
WinAssert(#espr, __FILE__, __LINE__, msg, ##_VA_ARGS__); \
44+
WinAssert(#expr, __FILE__, __LINE__, msg, ##__VA_ARGS__); \
4545
} \
4646
} while (0)
4747
#endif
4848

4949
/* C++11 Standard Detection */
50-
#if !defined(HAVE_CX11)
50+
#if !defined(HAVE_CXX11)
5151
/*
5252
* Clang does not seem to have a feature check for 'is_trivial'.
5353
* Assume it will be covered by one of the following checks ...

code/globalincs/toolchain/gcc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
# define Assertion(expr, msg, ...) \
4242
do { \
4343
if (!(expr)) { \
44-
WinAssert(#espr, __FILE__, __LINE__, msg, ##_VA_ARGS__); \
44+
WinAssert(#expr, __FILE__, __LINE__, msg, ##__VA_ARGS__); \
4545
} \
4646
} while (0)
4747
#endif
4848

4949
/* C++11 Standard Detection */
50-
#if !defined(HAVE_CX11)
50+
#if !defined(HAVE_CXX11)
5151
/*
52-
* For GCC with autotools, see AX_CXX_comPiLE_STDCXX_11 macro in the
52+
* For GCC with autotools, see AX_CXX_COMPiLE_STDCXX_11 macro in the
5353
* file "configure.ac". This sets HAVE_CXX11 & -std=c++0x or -std=c++11
5454
* as appropriate.
5555
*

code/globalincs/toolchain/mingw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
# define Assertion(expr, msg, ...) \
4242
do { \
4343
if (!(expr)) { \
44-
WinAssert(#espr, __FILE__, __LINE__, msg, ##_VA_ARGS__); \
44+
WinAssert(#expr, __FILE__, __LINE__, msg, ##__VA_ARGS__); \
4545
} \
4646
} while (0)
4747
#endif
4848

4949
/* C++11 Standard Detection */
50-
#if !defined(HAVE_CX11)
50+
#if !defined(HAVE_CXX11)
5151
/* TODO */
5252
#endif
5353

code/globalincs/toolchain/msvc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
# define Assertion(expr, msg, ...) \
5252
do { \
5353
if (!(expr)) { \
54-
WinAssert(#expr, __FILE__, __LINE__, msg, _VA_ARGS__); \
54+
WinAssert(#expr, __FILE__, __LINE__, msg, __VA_ARGS__); \
5555
} \
5656
} while (0)
5757
# else /* Older MSVC compilers */
@@ -64,7 +64,7 @@
6464
#endif
6565

6666
/* C++11 Standard Detection */
67-
#if !defined(HAVE_CX11)
67+
#if !defined(HAVE_CXX11)
6868
/* Use the Visual Studio version to detect C++11 support */
6969
# if _MSC_VER >= 1600
7070
# define HAVE_CXX11

0 commit comments

Comments
 (0)