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/System.h.in | |
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/System.h.in')
-rw-r--r-- | Source/kwsys/System.h.in | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/kwsys/System.h.in b/Source/kwsys/System.h.in index 102974d..a9d4f5e 100644 --- a/Source/kwsys/System.h.in +++ b/Source/kwsys/System.h.in @@ -10,11 +10,12 @@ not visible to user code. Use kwsysHeaderDump.pl to reproduce these macros after making changes to the interface. */ #if !defined(KWSYS_NAMESPACE) -#define kwsys_ns(x) @KWSYS_NAMESPACE@##x -#define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT +# define kwsys_ns(x) @KWSYS_NAMESPACE@##x +# define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT #endif #if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS -#define kwsysSystem_Parse_CommandForUnix kwsys_ns(System_Parse_CommandForUnix) +# define kwsysSystem_Parse_CommandForUnix \ + kwsys_ns(System_Parse_CommandForUnix) #endif #if defined(__cplusplus) @@ -49,11 +50,11 @@ kwsysEXPORT char** kwsysSystem_Parse_CommandForUnix(const char* command, /* If we are building a kwsys .c or .cxx file, let it use these macros. Otherwise, undefine them to keep the namespace clean. */ #if !defined(KWSYS_NAMESPACE) -#undef kwsys_ns -#undef kwsysEXPORT -#if !defined(KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS -#undef kwsysSystem_Parse_CommandForUnix -#endif +# undef kwsys_ns +# undef kwsysEXPORT +# if !defined(KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS +# undef kwsysSystem_Parse_CommandForUnix +# endif #endif #endif |