Commit bc1482cc authored by Brad King's avatar Brad King

ERR: Avoiding namespace pollution: kw_sys -> kwsys_ns. Also undefining the...

ERR: Avoiding namespace pollution: kw_sys -> kwsys_ns.  Also undefining the macro at the correct time.
parent f73d8e36
......@@ -20,53 +20,53 @@
namespace. These macros are used internally to kwsys only, and are
not visible to user code. Use kwsysHeaderDump.pl to reproduce
these macros after making changes to the interface. */
#define kw_sys(x) @KWSYS_NAMESPACE@##x
#define kwsys_ns(x) @KWSYS_NAMESPACE@##x
#define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
#define kwsysProcess kw_sys(Process)
#define kwsysProcess_s kw_sys(Process_s)
#define kwsysProcess_New kw_sys(Process_New)
#define kwsysProcess_Delete kw_sys(Process_Delete)
#define kwsysProcess_SetCommand kw_sys(Process_SetCommand)
#define kwsysProcess_AddCommand kw_sys(Process_AddCommand)
#define kwsysProcess_SetTimeout kw_sys(Process_SetTimeout)
#define kwsysProcess_SetWorkingDirectory kw_sys(Process_SetWorkingDirectory)
#define kwsysProcess_SetPipeFile kw_sys(Process_SetPipeFile)
#define kwsysProcess_SetPipeShared kw_sys(Process_SetPipeShared)
#define kwsysProcess_Option_HideWindow kw_sys(Process_Option_HideWindow)
#define kwsysProcess_GetOption kw_sys(Process_GetOption)
#define kwsysProcess_SetOption kw_sys(Process_SetOption)
#define kwsysProcess_Option_e kw_sys(Process_Option_e)
#define kwsysProcess_State_Starting kw_sys(Process_State_Starting)
#define kwsysProcess_State_Error kw_sys(Process_State_Error)
#define kwsysProcess_State_Exception kw_sys(Process_State_Exception)
#define kwsysProcess_State_Executing kw_sys(Process_State_Executing)
#define kwsysProcess_State_Exited kw_sys(Process_State_Exited)
#define kwsysProcess_State_Expired kw_sys(Process_State_Expired)
#define kwsysProcess_State_Killed kw_sys(Process_State_Killed)
#define kwsysProcess_GetState kw_sys(Process_GetState)
#define kwsysProcess_State_e kw_sys(Process_State_e)
#define kwsysProcess_Exception_None kw_sys(Process_Exception_None)
#define kwsysProcess_Exception_Fault kw_sys(Process_Exception_Fault)
#define kwsysProcess_Exception_Illegal kw_sys(Process_Exception_Illegal)
#define kwsysProcess_Exception_Interrupt kw_sys(Process_Exception_Interrupt)
#define kwsysProcess_Exception_Numerical kw_sys(Process_Exception_Numerical)
#define kwsysProcess_Exception_Other kw_sys(Process_Exception_Other)
#define kwsysProcess_GetExitException kw_sys(Process_GetExitException)
#define kwsysProcess_Exception_e kw_sys(Process_Exception_e)
#define kwsysProcess_GetExitCode kw_sys(Process_GetExitCode)
#define kwsysProcess_GetExitValue kw_sys(Process_GetExitValue)
#define kwsysProcess_GetErrorString kw_sys(Process_GetErrorString)
#define kwsysProcess_GetExceptionString kw_sys(Process_GetExceptionString)
#define kwsysProcess_Execute kw_sys(Process_Execute)
#define kwsysProcess_WaitForData kw_sys(Process_WaitForData)
#define kwsysProcess_Pipes_e kw_sys(Process_Pipes_e)
#define kwsysProcess_Pipe_None kw_sys(Process_Pipe_None)
#define kwsysProcess_Pipe_STDIN kw_sys(Process_Pipe_STDIN)
#define kwsysProcess_Pipe_STDOUT kw_sys(Process_Pipe_STDOUT)
#define kwsysProcess_Pipe_STDERR kw_sys(Process_Pipe_STDERR)
#define kwsysProcess_Pipe_Timeout kw_sys(Process_Pipe_Timeout)
#define kwsysProcess_WaitForExit kw_sys(Process_WaitForExit)
#define kwsysProcess_Kill kw_sys(Process_Kill)
#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_SetPipeShared kwsys_ns(Process_SetPipeShared)
#define kwsysProcess_Option_HideWindow kwsys_ns(Process_Option_HideWindow)
#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_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_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_WaitForExit kwsys_ns(Process_WaitForExit)
#define kwsysProcess_Kill kwsys_ns(Process_Kill)
#if defined(__cplusplus)
extern "C"
......@@ -306,7 +306,7 @@ kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
/* If we are building a kwsysProcess .c file, let it use these macros.
Otherwise, undefine them to keep the namespace clean. */
#if !defined(KWSYS_IN_PROCESS_C)
# undef kwsys
# undef kwsys_ns
# undef kwsysEXPORT
# undef kwsysProcess
# undef kwsysProcess_s
......
......@@ -20,9 +20,9 @@
namespace. These macros are used internally to kwsys only, and are
not visible to user code. Use kwsysHeaderDump.pl to reproduce
these macros after making changes to the interface. */
#define kw_sys(x) @KWSYS_NAMESPACE@##x
#define kwsys_ns(x) @KWSYS_NAMESPACE@##x
#define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
#define kwsysProcessWin32Kill kw_sys(ProcessWin32Kill)
#define kwsysProcessWin32Kill kwsys_ns(ProcessWin32Kill)
#if defined(__cplusplus)
extern "C"
......@@ -38,7 +38,7 @@ kwsysEXPORT int kwsysProcessWin32Kill(int pid);
/* If we are building a kwsysProcess .c file, let it use these macros.
Otherwise, undefine them to keep the namespace clean. */
#if !defined(KWSYS_IN_PROCESS_C)
# undef kwsys
# undef kwsys_ns
# undef kwsysEXPORT
# undef kwsysProcessWin32Kill
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment