actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

a) LUA_USE_LINUX doesn't sound MinGW friendly. Remind me to investigate exactly what that enables. b) Nobody uses VC2003 anymore. Bring back UNIQUE_NAME.

Browse Source
This commit is contained in:
Ben "root" Anderson
2013-10-24 19:23:46 -05:00
parent 7313f2d0aa
commit 810283f2a2
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+2
View File
@@ -135,7 +135,9 @@ case $host_os in
unix=yes unix=yes
;; ;;
esac esac
if test $host_os != mingw32; then
AC_DEFINE(LUA_USE_LINUX, 1, [Linux for Lua]) AC_DEFINE(LUA_USE_LINUX, 1, [Linux for Lua])
fi
AM_CONDITIONAL(UNIX, test "$unix" = "yes" ) AM_CONDITIONAL(UNIX, test "$unix" = "yes" )
AM_CONDITIONAL(LINUX, test "$linux" = "yes" ) AM_CONDITIONAL(LINUX, test "$linux" = "yes" )
AM_CONDITIONAL(BSD, test "$bsd" = "yes" ) AM_CONDITIONAL(BSD, test "$bsd" = "yes" )
src/global.h
+3 -7
View File
@@ -154,13 +154,9 @@ void ShowWarningOrTrace( const char *file, int line, const char *message, bool b
/* Use UNIQUE_NAME to get the line number concatenated to x. This is useful for /* Use UNIQUE_NAME to get the line number concatenated to x. This is useful for
* generating unique identifiers in other macros. */ * generating unique identifiers in other macros. */
/* XXX: VC2003 expanding __LINE__ to nothing in the first version. Investigate why. -Chris */ #define UNIQUE_NAME3(x,line) x##line
//#define UNIQUE_NAME3(x,line) x##line #define UNIQUE_NAME2(x,line) UNIQUE_NAME3(x, line)
//#define UNIQUE_NAME2(x,line) UNIQUE_NAME3(x, line) #define UNIQUE_NAME(x) UNIQUE_NAME2(x, __LINE__)
//#define UNIQUE_NAME(x) UNIQUE_NAME2(x, __LINE__)
#define UNIQUE_NAME3(x) x
#define UNIQUE_NAME2(x) UNIQUE_NAME3(x)
#define UNIQUE_NAME(x) UNIQUE_NAME2(x)
template <bool> struct CompileAssert; template <bool> struct CompileAssert;
template <> struct CompileAssert<true> { }; template <> struct CompileAssert<true> { };