diff options
author | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
commit | 81870f1159a7b2649b027a6c3f75eba555831488 (patch) | |
tree | 05eb767f2f2becb6480cfe348d08ebca4e1fc1cf /Source/kwsys/testSystemInformation.cxx | |
parent | eed0df951d95d48e7856107175a2baba212c3206 (diff) | |
parent | 3af8c7715b359affce99c575bdcb84ca87585bb2 (diff) | |
download | CMake-81870f1159a7b2649b027a6c3f75eba555831488.zip CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.gz CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-06-01 (8ef62b28)
Diffstat (limited to 'Source/kwsys/testSystemInformation.cxx')
-rw-r--r-- | Source/kwsys/testSystemInformation.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Source/kwsys/testSystemInformation.cxx b/Source/kwsys/testSystemInformation.cxx index 3a9217f..154517e 100644 --- a/Source/kwsys/testSystemInformation.cxx +++ b/Source/kwsys/testSystemInformation.cxx @@ -6,25 +6,25 @@ // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -#include "SystemInformation.hxx.in" +# include "SystemInformation.hxx.in" #endif #include <iostream> #if defined(KWSYS_USE_LONG_LONG) -#if defined(KWSYS_IOS_HAS_OSTREAM_LONG_LONG) -#define iostreamLongLong(x) (x) -#else -#define iostreamLongLong(x) ((long)x) -#endif +# if defined(KWSYS_IOS_HAS_OSTREAM_LONG_LONG) +# define iostreamLongLong(x) (x) +# else +# define iostreamLongLong(x) ((long)x) +# endif #elif defined(KWSYS_USE___INT64) -#if defined(KWSYS_IOS_HAS_OSTREAM___INT64) -#define iostreamLongLong(x) (x) +# if defined(KWSYS_IOS_HAS_OSTREAM___INT64) +# define iostreamLongLong(x) (x) +# else +# define iostreamLongLong(x) ((long)x) +# endif #else -#define iostreamLongLong(x) ((long)x) -#endif -#else -#error "No Long Long" +# error "No Long Long" #endif #define printMethod(info, m) std::cout << #m << ": " << info.m() << "\n" @@ -86,7 +86,7 @@ int testSystemInformation(int, char* []) } /* test stack trace - */ + */ std::cout << "Program Stack:" << std::endl << kwsys::SystemInformation::GetProgramStack(0, 0) << std::endl << std::endl; |