[Cmake-commits] [cmake-commits] king committed Base64.h.in 1.8 1.9 Configure.h.in 1.12 1.13 Configure.hxx.in 1.21 1.22 FundamentalType.h.in 1.1 1.2 MD5.h.in 1.1 1.2 Process.h.in 1.27 1.28 String.h.in 1.1 1.2 System.h.in 1.7 1.8 Terminal.h.in 1.2 1.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Apr 14 09:35:58 EDT 2009
Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv2529/Source/kwsys
Modified Files:
Base64.h.in Configure.h.in Configure.hxx.in
FundamentalType.h.in MD5.h.in Process.h.in String.h.in
System.h.in Terminal.h.in
Log Message:
ENH: Skip KWSys name maros in case of identity
All KWSys C symbol names begin with the KWSYS_NAMESPACE defined at
configuration time. For ease of editing we write canonical names with
the prefix 'kwsys' and use macros to map them to the configured prefix
at preprocessing time. In the case of standalone KWSys, the prefix is
'kwsys', so the macros were previously defined to their own names.
We now skip defining the macros in the identity case so that the final
symbol names are never themselves macros. This will allow the symbols
to be further transformed behind the scenes to help linkers in special
cases on some platforms.
Index: Base64.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Base64.h.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** Base64.h.in 26 Jul 2005 15:34:57 -0000 1.8
--- Base64.h.in 14 Apr 2009 13:35:56 -0000 1.9
***************
*** 25,35 ****
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #define kwsysBase64 kwsys_ns(Base64)
! #define kwsysBase64_Decode kwsys_ns(Base64_Decode)
! #define kwsysBase64_Decode3 kwsys_ns(Base64_Decode3)
! #define kwsysBase64_Encode kwsys_ns(Base64_Encode)
! #define kwsysBase64_Encode1 kwsys_ns(Base64_Encode1)
! #define kwsysBase64_Encode2 kwsys_ns(Base64_Encode2)
! #define kwsysBase64_Encode3 kwsys_ns(Base64_Encode3)
#if defined(__cplusplus)
--- 25,37 ----
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # define kwsysBase64 kwsys_ns(Base64)
! # define kwsysBase64_Decode kwsys_ns(Base64_Decode)
! # define kwsysBase64_Decode3 kwsys_ns(Base64_Decode3)
! # define kwsysBase64_Encode kwsys_ns(Base64_Encode)
! # define kwsysBase64_Encode1 kwsys_ns(Base64_Encode1)
! # define kwsysBase64_Encode2 kwsys_ns(Base64_Encode2)
! # define kwsysBase64_Encode3 kwsys_ns(Base64_Encode3)
! #endif
#if defined(__cplusplus)
***************
*** 107,117 ****
# undef kwsys_ns
# undef kwsysEXPORT
! # undef kwsysBase64
! # undef kwsysBase64_Decode
! # undef kwsysBase64_Decode3
! # undef kwsysBase64_Encode
! # undef kwsysBase64_Encode1
! # undef kwsysBase64_Encode2
! # undef kwsysBase64_Encode3
#endif
--- 109,121 ----
# undef kwsys_ns
# undef kwsysEXPORT
! # if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # undef kwsysBase64
! # undef kwsysBase64_Decode
! # undef kwsysBase64_Decode3
! # undef kwsysBase64_Encode
! # undef kwsysBase64_Encode1
! # undef kwsysBase64_Encode2
! # undef kwsysBase64_Encode3
! # endif
#endif
Index: String.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/String.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** String.h.in 11 Dec 2007 16:36:57 -0000 1.1
--- String.h.in 14 Apr 2009 13:35:56 -0000 1.2
***************
*** 27,32 ****
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #define kwsysString_strcasecmp kwsys_ns(String_strcasecmp)
! #define kwsysString_strncasecmp kwsys_ns(String_strncasecmp)
#if defined(__cplusplus)
--- 27,34 ----
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # define kwsysString_strcasecmp kwsys_ns(String_strcasecmp)
! # define kwsysString_strncasecmp kwsys_ns(String_strncasecmp)
! #endif
#if defined(__cplusplus)
***************
*** 59,64 ****
# undef kwsys_ns
# undef kwsysEXPORT
! # undef kwsysString_strcasecmp
! # undef kwsysString_strncasecmp
#endif
--- 61,68 ----
# undef kwsys_ns
# undef kwsysEXPORT
! # if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # undef kwsysString_strcasecmp
! # undef kwsysString_strncasecmp
! # endif
#endif
Index: Configure.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Configure.h.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** Configure.h.in 15 Aug 2007 15:38:13 -0000 1.12
--- Configure.h.in 14 Apr 2009 13:35:56 -0000 1.13
***************
*** 23,26 ****
--- 23,29 ----
#endif
+ /* Whether kwsys namespace is "kwsys". */
+ #define @KWSYS_NAMESPACE at _NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
+
/* If we are building a kwsys .c or .cxx file, suppress the Microsoft
deprecation warnings. */
Index: Process.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Process.h.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** Process.h.in 2 Apr 2008 12:36:51 -0000 1.27
--- Process.h.in 14 Apr 2009 13:35:56 -0000 1.28
***************
*** 25,79 ****
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #define kwsysProcess kwsys_ns(Process)
! #define kwsysProcess_s kwsys_ns(Process_s)
! #define kwsysProcess_New kwsys_ns(Process_New)
! #define kwsysProcess_Delete kwsys_ns(Process_Delete)
! #define kwsysProcess_SetCommand kwsys_ns(Process_SetCommand)
! #define kwsysProcess_AddCommand kwsys_ns(Process_AddCommand)
! #define kwsysProcess_SetTimeout kwsys_ns(Process_SetTimeout)
! #define kwsysProcess_SetWorkingDirectory kwsys_ns(Process_SetWorkingDirectory)
! #define kwsysProcess_SetPipeFile kwsys_ns(Process_SetPipeFile)
! #define kwsysProcess_SetPipeNative kwsys_ns(Process_SetPipeNative)
! #define kwsysProcess_SetPipeShared kwsys_ns(Process_SetPipeShared)
! #define kwsysProcess_Option_Detach kwsys_ns(Process_Option_Detach)
! #define kwsysProcess_Option_HideWindow kwsys_ns(Process_Option_HideWindow)
! #define kwsysProcess_Option_Verbatim kwsys_ns(Process_Option_Verbatim)
! #define kwsysProcess_GetOption kwsys_ns(Process_GetOption)
! #define kwsysProcess_SetOption kwsys_ns(Process_SetOption)
! #define kwsysProcess_Option_e kwsys_ns(Process_Option_e)
! #define kwsysProcess_State_Starting kwsys_ns(Process_State_Starting)
! #define kwsysProcess_State_Error kwsys_ns(Process_State_Error)
! #define kwsysProcess_State_Exception kwsys_ns(Process_State_Exception)
! #define kwsysProcess_State_Executing kwsys_ns(Process_State_Executing)
! #define kwsysProcess_State_Exited kwsys_ns(Process_State_Exited)
! #define kwsysProcess_State_Expired kwsys_ns(Process_State_Expired)
! #define kwsysProcess_State_Killed kwsys_ns(Process_State_Killed)
! #define kwsysProcess_State_Disowned kwsys_ns(Process_State_Disowned)
! #define kwsysProcess_GetState kwsys_ns(Process_GetState)
! #define kwsysProcess_State_e kwsys_ns(Process_State_e)
! #define kwsysProcess_Exception_None kwsys_ns(Process_Exception_None)
! #define kwsysProcess_Exception_Fault kwsys_ns(Process_Exception_Fault)
! #define kwsysProcess_Exception_Illegal kwsys_ns(Process_Exception_Illegal)
! #define kwsysProcess_Exception_Interrupt kwsys_ns(Process_Exception_Interrupt)
! #define kwsysProcess_Exception_Numerical kwsys_ns(Process_Exception_Numerical)
! #define kwsysProcess_Exception_Other kwsys_ns(Process_Exception_Other)
! #define kwsysProcess_GetExitException kwsys_ns(Process_GetExitException)
! #define kwsysProcess_Exception_e kwsys_ns(Process_Exception_e)
! #define kwsysProcess_GetExitCode kwsys_ns(Process_GetExitCode)
! #define kwsysProcess_GetExitValue kwsys_ns(Process_GetExitValue)
! #define kwsysProcess_GetErrorString kwsys_ns(Process_GetErrorString)
! #define kwsysProcess_GetExceptionString kwsys_ns(Process_GetExceptionString)
! #define kwsysProcess_Execute kwsys_ns(Process_Execute)
! #define kwsysProcess_Disown kwsys_ns(Process_Disown)
! #define kwsysProcess_WaitForData kwsys_ns(Process_WaitForData)
! #define kwsysProcess_Pipes_e kwsys_ns(Process_Pipes_e)
! #define kwsysProcess_Pipe_None kwsys_ns(Process_Pipe_None)
! #define kwsysProcess_Pipe_STDIN kwsys_ns(Process_Pipe_STDIN)
! #define kwsysProcess_Pipe_STDOUT kwsys_ns(Process_Pipe_STDOUT)
! #define kwsysProcess_Pipe_STDERR kwsys_ns(Process_Pipe_STDERR)
! #define kwsysProcess_Pipe_Timeout kwsys_ns(Process_Pipe_Timeout)
! #define kwsysProcess_Pipe_Handle kwsys_ns(Process_Pipe_Handle)
! #define kwsysProcess_WaitForExit kwsys_ns(Process_WaitForExit)
! #define kwsysProcess_Kill kwsys_ns(Process_Kill)
#if defined(__cplusplus)
--- 25,81 ----
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # define kwsysProcess kwsys_ns(Process)
! # define kwsysProcess_s kwsys_ns(Process_s)
! # define kwsysProcess_New kwsys_ns(Process_New)
! # define kwsysProcess_Delete kwsys_ns(Process_Delete)
! # define kwsysProcess_SetCommand kwsys_ns(Process_SetCommand)
! # define kwsysProcess_AddCommand kwsys_ns(Process_AddCommand)
! # define kwsysProcess_SetTimeout kwsys_ns(Process_SetTimeout)
! # define kwsysProcess_SetWorkingDirectory kwsys_ns(Process_SetWorkingDirectory)
! # define kwsysProcess_SetPipeFile kwsys_ns(Process_SetPipeFile)
! # define kwsysProcess_SetPipeNative kwsys_ns(Process_SetPipeNative)
! # define kwsysProcess_SetPipeShared kwsys_ns(Process_SetPipeShared)
! # define kwsysProcess_Option_Detach kwsys_ns(Process_Option_Detach)
! # define kwsysProcess_Option_HideWindow kwsys_ns(Process_Option_HideWindow)
! # define kwsysProcess_Option_Verbatim kwsys_ns(Process_Option_Verbatim)
! # define kwsysProcess_GetOption kwsys_ns(Process_GetOption)
! # define kwsysProcess_SetOption kwsys_ns(Process_SetOption)
! # define kwsysProcess_Option_e kwsys_ns(Process_Option_e)
! # define kwsysProcess_State_Starting kwsys_ns(Process_State_Starting)
! # define kwsysProcess_State_Error kwsys_ns(Process_State_Error)
! # define kwsysProcess_State_Exception kwsys_ns(Process_State_Exception)
! # define kwsysProcess_State_Executing kwsys_ns(Process_State_Executing)
! # define kwsysProcess_State_Exited kwsys_ns(Process_State_Exited)
! # define kwsysProcess_State_Expired kwsys_ns(Process_State_Expired)
! # define kwsysProcess_State_Killed kwsys_ns(Process_State_Killed)
! # define kwsysProcess_State_Disowned kwsys_ns(Process_State_Disowned)
! # define kwsysProcess_GetState kwsys_ns(Process_GetState)
! # define kwsysProcess_State_e kwsys_ns(Process_State_e)
! # define kwsysProcess_Exception_None kwsys_ns(Process_Exception_None)
! # define kwsysProcess_Exception_Fault kwsys_ns(Process_Exception_Fault)
! # define kwsysProcess_Exception_Illegal kwsys_ns(Process_Exception_Illegal)
! # define kwsysProcess_Exception_Interrupt kwsys_ns(Process_Exception_Interrupt)
! # define kwsysProcess_Exception_Numerical kwsys_ns(Process_Exception_Numerical)
! # define kwsysProcess_Exception_Other kwsys_ns(Process_Exception_Other)
! # define kwsysProcess_GetExitException kwsys_ns(Process_GetExitException)
! # define kwsysProcess_Exception_e kwsys_ns(Process_Exception_e)
! # define kwsysProcess_GetExitCode kwsys_ns(Process_GetExitCode)
! # define kwsysProcess_GetExitValue kwsys_ns(Process_GetExitValue)
! # define kwsysProcess_GetErrorString kwsys_ns(Process_GetErrorString)
! # define kwsysProcess_GetExceptionString kwsys_ns(Process_GetExceptionString)
! # define kwsysProcess_Execute kwsys_ns(Process_Execute)
! # define kwsysProcess_Disown kwsys_ns(Process_Disown)
! # define kwsysProcess_WaitForData kwsys_ns(Process_WaitForData)
! # define kwsysProcess_Pipes_e kwsys_ns(Process_Pipes_e)
! # define kwsysProcess_Pipe_None kwsys_ns(Process_Pipe_None)
! # define kwsysProcess_Pipe_STDIN kwsys_ns(Process_Pipe_STDIN)
! # define kwsysProcess_Pipe_STDOUT kwsys_ns(Process_Pipe_STDOUT)
! # define kwsysProcess_Pipe_STDERR kwsys_ns(Process_Pipe_STDERR)
! # define kwsysProcess_Pipe_Timeout kwsys_ns(Process_Pipe_Timeout)
! # define kwsysProcess_Pipe_Handle kwsys_ns(Process_Pipe_Handle)
! # define kwsysProcess_WaitForExit kwsys_ns(Process_WaitForExit)
! # define kwsysProcess_Kill kwsys_ns(Process_Kill)
! #endif
#if defined(__cplusplus)
***************
*** 371,425 ****
# undef kwsys_ns
# undef kwsysEXPORT
! # undef kwsysProcess
! # undef kwsysProcess_s
! # undef kwsysProcess_New
! # undef kwsysProcess_Delete
! # undef kwsysProcess_SetCommand
! # undef kwsysProcess_AddCommand
! # undef kwsysProcess_SetTimeout
! # undef kwsysProcess_SetWorkingDirectory
! # undef kwsysProcess_SetPipeFile
! # undef kwsysProcess_SetPipeNative
! # undef kwsysProcess_SetPipeShared
! # undef kwsysProcess_Option_Detach
! # undef kwsysProcess_Option_HideWindow
! # undef kwsysProcess_Option_Verbatim
! # undef kwsysProcess_GetOption
! # undef kwsysProcess_SetOption
! # undef kwsysProcess_Option_e
! # undef kwsysProcess_State_Starting
! # undef kwsysProcess_State_Error
! # undef kwsysProcess_State_Exception
! # undef kwsysProcess_State_Executing
! # undef kwsysProcess_State_Exited
! # undef kwsysProcess_State_Expired
! # undef kwsysProcess_State_Killed
! # undef kwsysProcess_State_Disowned
! # undef kwsysProcess_GetState
! # undef kwsysProcess_State_e
! # undef kwsysProcess_Exception_None
! # undef kwsysProcess_Exception_Fault
! # undef kwsysProcess_Exception_Illegal
! # undef kwsysProcess_Exception_Interrupt
! # undef kwsysProcess_Exception_Numerical
! # undef kwsysProcess_Exception_Other
! # undef kwsysProcess_GetExitException
! # undef kwsysProcess_Exception_e
! # undef kwsysProcess_GetExitCode
! # undef kwsysProcess_GetExitValue
! # undef kwsysProcess_GetErrorString
! # undef kwsysProcess_GetExceptionString
! # undef kwsysProcess_Execute
! # undef kwsysProcess_Disown
! # undef kwsysProcess_WaitForData
! # undef kwsysProcess_Pipes_e
! # undef kwsysProcess_Pipe_None
! # undef kwsysProcess_Pipe_STDIN
! # undef kwsysProcess_Pipe_STDOUT
! # undef kwsysProcess_Pipe_STDERR
! # undef kwsysProcess_Pipe_Timeout
! # undef kwsysProcess_Pipe_Handle
! # undef kwsysProcess_WaitForExit
! # undef kwsysProcess_Kill
#endif
--- 373,429 ----
# undef kwsys_ns
# undef kwsysEXPORT
! # if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # undef kwsysProcess
! # undef kwsysProcess_s
! # undef kwsysProcess_New
! # undef kwsysProcess_Delete
! # undef kwsysProcess_SetCommand
! # undef kwsysProcess_AddCommand
! # undef kwsysProcess_SetTimeout
! # undef kwsysProcess_SetWorkingDirectory
! # undef kwsysProcess_SetPipeFile
! # undef kwsysProcess_SetPipeNative
! # undef kwsysProcess_SetPipeShared
! # undef kwsysProcess_Option_Detach
! # undef kwsysProcess_Option_HideWindow
! # undef kwsysProcess_Option_Verbatim
! # undef kwsysProcess_GetOption
! # undef kwsysProcess_SetOption
! # undef kwsysProcess_Option_e
! # undef kwsysProcess_State_Starting
! # undef kwsysProcess_State_Error
! # undef kwsysProcess_State_Exception
! # undef kwsysProcess_State_Executing
! # undef kwsysProcess_State_Exited
! # undef kwsysProcess_State_Expired
! # undef kwsysProcess_State_Killed
! # undef kwsysProcess_State_Disowned
! # undef kwsysProcess_GetState
! # undef kwsysProcess_State_e
! # undef kwsysProcess_Exception_None
! # undef kwsysProcess_Exception_Fault
! # undef kwsysProcess_Exception_Illegal
! # undef kwsysProcess_Exception_Interrupt
! # undef kwsysProcess_Exception_Numerical
! # undef kwsysProcess_Exception_Other
! # undef kwsysProcess_GetExitException
! # undef kwsysProcess_Exception_e
! # undef kwsysProcess_GetExitCode
! # undef kwsysProcess_GetExitValue
! # undef kwsysProcess_GetErrorString
! # undef kwsysProcess_GetExceptionString
! # undef kwsysProcess_Execute
! # undef kwsysProcess_Disown
! # undef kwsysProcess_WaitForData
! # undef kwsysProcess_Pipes_e
! # undef kwsysProcess_Pipe_None
! # undef kwsysProcess_Pipe_STDIN
! # undef kwsysProcess_Pipe_STDOUT
! # undef kwsysProcess_Pipe_STDERR
! # undef kwsysProcess_Pipe_Timeout
! # undef kwsysProcess_Pipe_Handle
! # undef kwsysProcess_WaitForExit
! # undef kwsysProcess_Kill
! # endif
#endif
Index: MD5.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/MD5.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** MD5.h.in 14 Mar 2007 19:12:10 -0000 1.1
--- MD5.h.in 14 Apr 2009 13:35:56 -0000 1.2
***************
*** 25,37 ****
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #define kwsysMD5 kwsys_ns(MD5)
! #define kwsysMD5_s kwsys_ns(MD5_s)
! #define kwsysMD5_New kwsys_ns(MD5_New)
! #define kwsysMD5_Delete kwsys_ns(MD5_Delete)
! #define kwsysMD5_Initialize kwsys_ns(MD5_Initialize)
! #define kwsysMD5_Append kwsys_ns(MD5_Append)
! #define kwsysMD5_Finalize kwsys_ns(MD5_Finalize)
! #define kwsysMD5_FinalizeHex kwsys_ns(MD5_FinalizeHex)
! #define kwsysMD5_DigestToHex kwsys_ns(MD5_DigestToHex)
#if defined(__cplusplus)
--- 25,39 ----
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # define kwsysMD5 kwsys_ns(MD5)
! # define kwsysMD5_s kwsys_ns(MD5_s)
! # define kwsysMD5_New kwsys_ns(MD5_New)
! # define kwsysMD5_Delete kwsys_ns(MD5_Delete)
! # define kwsysMD5_Initialize kwsys_ns(MD5_Initialize)
! # define kwsysMD5_Append kwsys_ns(MD5_Append)
! # define kwsysMD5_Finalize kwsys_ns(MD5_Finalize)
! # define kwsysMD5_FinalizeHex kwsys_ns(MD5_FinalizeHex)
! # define kwsysMD5_DigestToHex kwsys_ns(MD5_DigestToHex)
! #endif
#if defined(__cplusplus)
***************
*** 92,104 ****
# undef kwsys_ns
# undef kwsysEXPORT
! # undef kwsysMD5
! # undef kwsysMD5_s
! # undef kwsysMD5_New
! # undef kwsysMD5_Delete
! # undef kwsysMD5_Initialize
! # undef kwsysMD5_Append
! # undef kwsysMD5_Finalize
! # undef kwsysMD5_FinalizeHex
! # undef kwsysMD5_DigestToHex
#endif
--- 94,108 ----
# undef kwsys_ns
# undef kwsysEXPORT
! # if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # undef kwsysMD5
! # undef kwsysMD5_s
! # undef kwsysMD5_New
! # undef kwsysMD5_Delete
! # undef kwsysMD5_Initialize
! # undef kwsysMD5_Append
! # undef kwsysMD5_Finalize
! # undef kwsysMD5_FinalizeHex
! # undef kwsysMD5_DigestToHex
! # endif
#endif
Index: FundamentalType.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/FundamentalType.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** FundamentalType.h.in 26 Jul 2005 15:37:30 -0000 1.1
--- FundamentalType.h.in 14 Apr 2009 13:35:56 -0000 1.2
***************
*** 25,37 ****
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #define kwsysFundamentalType kwsys_ns(FundamentalType)
! #define kwsysFundamentalType_Int8 kwsys_ns(FundamentalType_Int8)
! #define kwsysFundamentalType_UInt8 kwsys_ns(FundamentalType_UInt8)
! #define kwsysFundamentalType_Int16 kwsys_ns(FundamentalType_Int16)
! #define kwsysFundamentalType_UInt16 kwsys_ns(FundamentalType_UInt16)
! #define kwsysFundamentalType_Int32 kwsys_ns(FundamentalType_Int32)
! #define kwsysFundamentalType_UInt32 kwsys_ns(FundamentalType_UInt32)
! #define kwsysFundamentalType_Int64 kwsys_ns(FundamentalType_Int64)
! #define kwsysFundamentalType_UInt64 kwsys_ns(FundamentalType_UInt64)
/* The size of fundamental types. Types that do not exist have size 0. */
--- 25,40 ----
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
!
! #if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # define kwsysFundamentalType kwsys_ns(FundamentalType)
! # define kwsysFundamentalType_Int8 kwsys_ns(FundamentalType_Int8)
! # define kwsysFundamentalType_UInt8 kwsys_ns(FundamentalType_UInt8)
! # define kwsysFundamentalType_Int16 kwsys_ns(FundamentalType_Int16)
! # define kwsysFundamentalType_UInt16 kwsys_ns(FundamentalType_UInt16)
! # define kwsysFundamentalType_Int32 kwsys_ns(FundamentalType_Int32)
! # define kwsysFundamentalType_UInt32 kwsys_ns(FundamentalType_UInt32)
! # define kwsysFundamentalType_Int64 kwsys_ns(FundamentalType_Int64)
! # define kwsysFundamentalType_UInt64 kwsys_ns(FundamentalType_UInt64)
! #endif
/* The size of fundamental types. Types that do not exist have size 0. */
***************
*** 115,127 ****
# undef kwsys_ns
# undef kwsysEXPORT
! # undef kwsysFundamentalType
! # undef kwsysFundamentalType_Int8
! # undef kwsysFundamentalType_UInt8
! # undef kwsysFundamentalType_Int16
! # undef kwsysFundamentalType_UInt16
! # undef kwsysFundamentalType_Int32
! # undef kwsysFundamentalType_UInt32
! # undef kwsysFundamentalType_Int64
! # undef kwsysFundamentalType_UInt64
#endif
--- 118,132 ----
# undef kwsys_ns
# undef kwsysEXPORT
! # if !defined(KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # undef kwsysFundamentalType
! # undef kwsysFundamentalType_Int8
! # undef kwsysFundamentalType_UInt8
! # undef kwsysFundamentalType_Int16
! # undef kwsysFundamentalType_UInt16
! # undef kwsysFundamentalType_Int32
! # undef kwsysFundamentalType_UInt32
! # undef kwsysFundamentalType_Int64
! # undef kwsysFundamentalType_UInt64
! # endif
#endif
Index: Terminal.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Terminal.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** Terminal.h.in 25 Apr 2006 12:33:51 -0000 1.2
--- Terminal.h.in 14 Apr 2009 13:35:56 -0000 1.3
***************
*** 27,56 ****
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #define kwsysTerminal_cfprintf kwsys_ns(Terminal_cfprintf)
! #define kwsysTerminal_Color_e kwsys_ns(Terminal_Color_e)
! #define kwsysTerminal_Color_Normal kwsys_ns(Terminal_Color_Normal)
! #define kwsysTerminal_Color_ForegroundBlack kwsys_ns(Terminal_Color_ForegroundBlack)
! #define kwsysTerminal_Color_ForegroundRed kwsys_ns(Terminal_Color_ForegroundRed)
! #define kwsysTerminal_Color_ForegroundGreen kwsys_ns(Terminal_Color_ForegroundGreen)
! #define kwsysTerminal_Color_ForegroundYellow kwsys_ns(Terminal_Color_ForegroundYellow)
! #define kwsysTerminal_Color_ForegroundBlue kwsys_ns(Terminal_Color_ForegroundBlue)
! #define kwsysTerminal_Color_ForegroundMagenta kwsys_ns(Terminal_Color_ForegroundMagenta)
! #define kwsysTerminal_Color_ForegroundCyan kwsys_ns(Terminal_Color_ForegroundCyan)
! #define kwsysTerminal_Color_ForegroundWhite kwsys_ns(Terminal_Color_ForegroundWhite)
! #define kwsysTerminal_Color_ForegroundMask kwsys_ns(Terminal_Color_ForegroundMask)
! #define kwsysTerminal_Color_BackgroundBlack kwsys_ns(Terminal_Color_BackgroundBlack)
! #define kwsysTerminal_Color_BackgroundRed kwsys_ns(Terminal_Color_BackgroundRed)
! #define kwsysTerminal_Color_BackgroundGreen kwsys_ns(Terminal_Color_BackgroundGreen)
! #define kwsysTerminal_Color_BackgroundYellow kwsys_ns(Terminal_Color_BackgroundYellow)
! #define kwsysTerminal_Color_BackgroundBlue kwsys_ns(Terminal_Color_BackgroundBlue)
! #define kwsysTerminal_Color_BackgroundMagenta kwsys_ns(Terminal_Color_BackgroundMagenta)
! #define kwsysTerminal_Color_BackgroundCyan kwsys_ns(Terminal_Color_BackgroundCyan)
! #define kwsysTerminal_Color_BackgroundWhite kwsys_ns(Terminal_Color_BackgroundWhite)
! #define kwsysTerminal_Color_BackgroundMask kwsys_ns(Terminal_Color_BackgroundMask)
! #define kwsysTerminal_Color_ForegroundBold kwsys_ns(Terminal_Color_ForegroundBold)
! #define kwsysTerminal_Color_BackgroundBold kwsys_ns(Terminal_Color_BackgroundBold)
! #define kwsysTerminal_Color_AssumeTTY kwsys_ns(Terminal_Color_AssumeTTY)
! #define kwsysTerminal_Color_AssumeVT100 kwsys_ns(Terminal_Color_AssumeVT100)
! #define kwsysTerminal_Color_AttributeMask kwsys_ns(Terminal_Color_AttributeMask)
#if defined(__cplusplus)
--- 27,58 ----
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # define kwsysTerminal_cfprintf kwsys_ns(Terminal_cfprintf)
! # define kwsysTerminal_Color_e kwsys_ns(Terminal_Color_e)
! # define kwsysTerminal_Color_Normal kwsys_ns(Terminal_Color_Normal)
! # define kwsysTerminal_Color_ForegroundBlack kwsys_ns(Terminal_Color_ForegroundBlack)
! # define kwsysTerminal_Color_ForegroundRed kwsys_ns(Terminal_Color_ForegroundRed)
! # define kwsysTerminal_Color_ForegroundGreen kwsys_ns(Terminal_Color_ForegroundGreen)
! # define kwsysTerminal_Color_ForegroundYellow kwsys_ns(Terminal_Color_ForegroundYellow)
! # define kwsysTerminal_Color_ForegroundBlue kwsys_ns(Terminal_Color_ForegroundBlue)
! # define kwsysTerminal_Color_ForegroundMagenta kwsys_ns(Terminal_Color_ForegroundMagenta)
! # define kwsysTerminal_Color_ForegroundCyan kwsys_ns(Terminal_Color_ForegroundCyan)
! # define kwsysTerminal_Color_ForegroundWhite kwsys_ns(Terminal_Color_ForegroundWhite)
! # define kwsysTerminal_Color_ForegroundMask kwsys_ns(Terminal_Color_ForegroundMask)
! # define kwsysTerminal_Color_BackgroundBlack kwsys_ns(Terminal_Color_BackgroundBlack)
! # define kwsysTerminal_Color_BackgroundRed kwsys_ns(Terminal_Color_BackgroundRed)
! # define kwsysTerminal_Color_BackgroundGreen kwsys_ns(Terminal_Color_BackgroundGreen)
! # define kwsysTerminal_Color_BackgroundYellow kwsys_ns(Terminal_Color_BackgroundYellow)
! # define kwsysTerminal_Color_BackgroundBlue kwsys_ns(Terminal_Color_BackgroundBlue)
! # define kwsysTerminal_Color_BackgroundMagenta kwsys_ns(Terminal_Color_BackgroundMagenta)
! # define kwsysTerminal_Color_BackgroundCyan kwsys_ns(Terminal_Color_BackgroundCyan)
! # define kwsysTerminal_Color_BackgroundWhite kwsys_ns(Terminal_Color_BackgroundWhite)
! # define kwsysTerminal_Color_BackgroundMask kwsys_ns(Terminal_Color_BackgroundMask)
! # define kwsysTerminal_Color_ForegroundBold kwsys_ns(Terminal_Color_ForegroundBold)
! # define kwsysTerminal_Color_BackgroundBold kwsys_ns(Terminal_Color_BackgroundBold)
! # define kwsysTerminal_Color_AssumeTTY kwsys_ns(Terminal_Color_AssumeTTY)
! # define kwsysTerminal_Color_AssumeVT100 kwsys_ns(Terminal_Color_AssumeVT100)
! # define kwsysTerminal_Color_AttributeMask kwsys_ns(Terminal_Color_AttributeMask)
! #endif
#if defined(__cplusplus)
***************
*** 127,156 ****
# undef kwsys_ns
# undef kwsysEXPORT
! # undef kwsysTerminal_cfprintf
! # undef kwsysTerminal_Color_e
! # undef kwsysTerminal_Color_Normal
! # undef kwsysTerminal_Color_ForegroundBlack
! # undef kwsysTerminal_Color_ForegroundRed
! # undef kwsysTerminal_Color_ForegroundGreen
! # undef kwsysTerminal_Color_ForegroundYellow
! # undef kwsysTerminal_Color_ForegroundBlue
! # undef kwsysTerminal_Color_ForegroundMagenta
! # undef kwsysTerminal_Color_ForegroundCyan
! # undef kwsysTerminal_Color_ForegroundWhite
! # undef kwsysTerminal_Color_ForegroundMask
! # undef kwsysTerminal_Color_BackgroundBlack
! # undef kwsysTerminal_Color_BackgroundRed
! # undef kwsysTerminal_Color_BackgroundGreen
! # undef kwsysTerminal_Color_BackgroundYellow
! # undef kwsysTerminal_Color_BackgroundBlue
! # undef kwsysTerminal_Color_BackgroundMagenta
! # undef kwsysTerminal_Color_BackgroundCyan
! # undef kwsysTerminal_Color_BackgroundWhite
! # undef kwsysTerminal_Color_BackgroundMask
! # undef kwsysTerminal_Color_ForegroundBold
! # undef kwsysTerminal_Color_BackgroundBold
! # undef kwsysTerminal_Color_AssumeTTY
! # undef kwsysTerminal_Color_AssumeVT100
! # undef kwsysTerminal_Color_AttributeMask
#endif
--- 129,160 ----
# undef kwsys_ns
# undef kwsysEXPORT
! # if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # undef kwsysTerminal_cfprintf
! # undef kwsysTerminal_Color_e
! # undef kwsysTerminal_Color_Normal
! # undef kwsysTerminal_Color_ForegroundBlack
! # undef kwsysTerminal_Color_ForegroundRed
! # undef kwsysTerminal_Color_ForegroundGreen
! # undef kwsysTerminal_Color_ForegroundYellow
! # undef kwsysTerminal_Color_ForegroundBlue
! # undef kwsysTerminal_Color_ForegroundMagenta
! # undef kwsysTerminal_Color_ForegroundCyan
! # undef kwsysTerminal_Color_ForegroundWhite
! # undef kwsysTerminal_Color_ForegroundMask
! # undef kwsysTerminal_Color_BackgroundBlack
! # undef kwsysTerminal_Color_BackgroundRed
! # undef kwsysTerminal_Color_BackgroundGreen
! # undef kwsysTerminal_Color_BackgroundYellow
! # undef kwsysTerminal_Color_BackgroundBlue
! # undef kwsysTerminal_Color_BackgroundMagenta
! # undef kwsysTerminal_Color_BackgroundCyan
! # undef kwsysTerminal_Color_BackgroundWhite
! # undef kwsysTerminal_Color_BackgroundMask
! # undef kwsysTerminal_Color_ForegroundBold
! # undef kwsysTerminal_Color_BackgroundBold
! # undef kwsysTerminal_Color_AssumeTTY
! # undef kwsysTerminal_Color_AssumeVT100
! # undef kwsysTerminal_Color_AttributeMask
! # endif
#endif
Index: Configure.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Configure.hxx.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** Configure.hxx.in 9 Jun 2005 12:02:58 -0000 1.21
--- Configure.hxx.in 14 Apr 2009 13:35:56 -0000 1.22
***************
*** 18,24 ****
#include <@KWSYS_NAMESPACE@/Configure.h>
- /* Whether kwsys namespace is "kwsys". */
- #define @KWSYS_NAMESPACE at _NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
-
/* Whether ANSI C++ stream headers are to be used. */
#define @KWSYS_NAMESPACE at _IOS_USE_ANSI @KWSYS_IOS_USE_ANSI@
--- 18,21 ----
Index: System.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/System.h.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** System.h.in 13 Jan 2008 21:36:20 -0000 1.7
--- System.h.in 14 Apr 2009 13:35:56 -0000 1.8
***************
*** 25,40 ****
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #define kwsysSystem_Shell_GetArgumentForWindows kwsys_ns(System_Shell_GetArgumentForWindows)
! #define kwsysSystem_Shell_GetArgumentForUnix kwsys_ns(System_Shell_GetArgumentForUnix)
! #define kwsysSystem_Shell_GetArgumentSizeForWindows kwsys_ns(System_Shell_GetArgumentSizeForWindows)
! #define kwsysSystem_Shell_GetArgumentSizeForUnix kwsys_ns(System_Shell_GetArgumentSizeForUnix)
! #define kwsysSystem_Shell_Flag_e kwsys_ns(System_Shell_Flag_e)
! #define kwsysSystem_Shell_Flag_Make kwsys_ns(System_Shell_Flag_Make)
! #define kwsysSystem_Shell_Flag_VSIDE kwsys_ns(System_Shell_Flag_VSIDE)
! #define kwsysSystem_Shell_Flag_EchoWindows kwsys_ns(System_Shell_Flag_EchoWindows)
! #define kwsysSystem_Shell_Flag_WatcomWMake kwsys_ns(System_Shell_Flag_WatcomWMake)
! #define kwsysSystem_Shell_Flag_MinGWMake kwsys_ns(System_Shell_Flag_MinGWMake)
! #define kwsysSystem_Shell_Flag_NMake kwsys_ns(System_Shell_Flag_NMake)
! #define kwsysSystem_Shell_Flag_AllowMakeVariables kwsys_ns(System_Shell_Flag_AllowMakeVariables)
#if defined(__cplusplus)
--- 25,42 ----
# define kwsysEXPORT @KWSYS_NAMESPACE at _EXPORT
#endif
! #if !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # define kwsysSystem_Shell_GetArgumentForWindows kwsys_ns(System_Shell_GetArgumentForWindows)
! # define kwsysSystem_Shell_GetArgumentForUnix kwsys_ns(System_Shell_GetArgumentForUnix)
! # define kwsysSystem_Shell_GetArgumentSizeForWindows kwsys_ns(System_Shell_GetArgumentSizeForWindows)
! # define kwsysSystem_Shell_GetArgumentSizeForUnix kwsys_ns(System_Shell_GetArgumentSizeForUnix)
! # define kwsysSystem_Shell_Flag_e kwsys_ns(System_Shell_Flag_e)
! # define kwsysSystem_Shell_Flag_Make kwsys_ns(System_Shell_Flag_Make)
! # define kwsysSystem_Shell_Flag_VSIDE kwsys_ns(System_Shell_Flag_VSIDE)
! # define kwsysSystem_Shell_Flag_EchoWindows kwsys_ns(System_Shell_Flag_EchoWindows)
! # define kwsysSystem_Shell_Flag_WatcomWMake kwsys_ns(System_Shell_Flag_WatcomWMake)
! # define kwsysSystem_Shell_Flag_MinGWMake kwsys_ns(System_Shell_Flag_MinGWMake)
! # define kwsysSystem_Shell_Flag_NMake kwsys_ns(System_Shell_Flag_NMake)
! # define kwsysSystem_Shell_Flag_AllowMakeVariables kwsys_ns(System_Shell_Flag_AllowMakeVariables)
! #endif
#if defined(__cplusplus)
***************
*** 112,127 ****
# undef kwsys_ns
# undef kwsysEXPORT
! # undef kwsysSystem_Shell_GetArgumentForWindows
! # undef kwsysSystem_Shell_GetArgumentForUnix
! # undef kwsysSystem_Shell_GetArgumentSizeForWindows
! # undef kwsysSystem_Shell_GetArgumentSizeForUnix
! # undef kwsysSystem_Shell_Flag_e
! # undef kwsysSystem_Shell_Flag_Make
! # undef kwsysSystem_Shell_Flag_VSIDE
! # undef kwsysSystem_Shell_Flag_EchoWindows
! # undef kwsysSystem_Shell_Flag_WatcomWMake
! # undef kwsysSystem_Shell_Flag_MinGWMake
! # undef kwsysSystem_Shell_Flag_NMake
! # undef kwsysSystem_Shell_Flag_AllowMakeVariables
#endif
--- 114,131 ----
# undef kwsys_ns
# undef kwsysEXPORT
! # if !defined(KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
! # undef kwsysSystem_Shell_GetArgumentForWindows
! # undef kwsysSystem_Shell_GetArgumentForUnix
! # undef kwsysSystem_Shell_GetArgumentSizeForWindows
! # undef kwsysSystem_Shell_GetArgumentSizeForUnix
! # undef kwsysSystem_Shell_Flag_e
! # undef kwsysSystem_Shell_Flag_Make
! # undef kwsysSystem_Shell_Flag_VSIDE
! # undef kwsysSystem_Shell_Flag_EchoWindows
! # undef kwsysSystem_Shell_Flag_WatcomWMake
! # undef kwsysSystem_Shell_Flag_MinGWMake
! # undef kwsysSystem_Shell_Flag_NMake
! # undef kwsysSystem_Shell_Flag_AllowMakeVariables
! # endif
#endif
More information about the Cmake-commits
mailing list