ERR: On Borland preprocessor goes into recursion which adds some weid spaces in the include name. This fixes it

4 files changed, 57 insertions, 57 deletions

diff --git a/Source/kwsys/Base64.h.in b/Source/kwsys/Base64.h.in
index b460db0..93431cc 100644
--- a/Source/kwsys/Base64.h.in
+++ b/Source/kwsys/Base64.h.in
@@ -20,15 +20,15 @@
    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 kwsys(x) @KWSYS_NAMESPACE@##x
+#define kw_sys(x) @KWSYS_NAMESPACE@##x
 #define kwsysEXPORT          @KWSYS_NAMESPACE@_EXPORT
-#define kwsysBase64          kwsys(Base64)
-#define kwsysBase64_Decode   kwsys(Base64_Decode)
-#define kwsysBase64_Decode3  kwsys(Base64_Decode3)
-#define kwsysBase64_Encode   kwsys(Base64_Encode)
-#define kwsysBase64_Encode1  kwsys(Base64_Encode1)
-#define kwsysBase64_Encode2  kwsys(Base64_Encode2)
-#define kwsysBase64_Encode3  kwsys(Base64_Encode3)
+#define kwsysBase64          kw_sys(Base64)
+#define kwsysBase64_Decode   kw_sys(Base64_Decode)
+#define kwsysBase64_Decode3  kw_sys(Base64_Decode3)
+#define kwsysBase64_Encode   kw_sys(Base64_Encode)
+#define kwsysBase64_Encode1  kw_sys(Base64_Encode1)
+#define kwsysBase64_Encode2  kw_sys(Base64_Encode2)
+#define kwsysBase64_Encode3  kw_sys(Base64_Encode3)
 
 #if defined(__cplusplus)
 extern "C"
diff --git a/Source/kwsys/Process.h.in b/Source/kwsys/Process.h.in
index f47b9c6..9d61298 100644
--- a/Source/kwsys/Process.h.in
+++ b/Source/kwsys/Process.h.in
@@ -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 kwsys(x) @KWSYS_NAMESPACE@##x
+#define kw_sys(x) @KWSYS_NAMESPACE@##x
 #define kwsysEXPORT                      @KWSYS_NAMESPACE@_EXPORT
-#define kwsysProcess                     kwsys(Process)
-#define kwsysProcess_s                   kwsys(Process_s)
-#define kwsysProcess_New                 kwsys(Process_New)
-#define kwsysProcess_Delete              kwsys(Process_Delete)
-#define kwsysProcess_SetCommand          kwsys(Process_SetCommand)
-#define kwsysProcess_AddCommand          kwsys(Process_AddCommand)
-#define kwsysProcess_SetTimeout          kwsys(Process_SetTimeout)
-#define kwsysProcess_SetWorkingDirectory kwsys(Process_SetWorkingDirectory)
-#define kwsysProcess_SetPipeFile         kwsys(Process_SetPipeFile)
-#define kwsysProcess_SetPipeShared       kwsys(Process_SetPipeShared)
-#define kwsysProcess_Option_HideWindow   kwsys(Process_Option_HideWindow)
-#define kwsysProcess_GetOption           kwsys(Process_GetOption)
-#define kwsysProcess_SetOption           kwsys(Process_SetOption)
-#define kwsysProcess_Option_e            kwsys(Process_Option_e)
-#define kwsysProcess_State_Starting      kwsys(Process_State_Starting)
-#define kwsysProcess_State_Error         kwsys(Process_State_Error)
-#define kwsysProcess_State_Exception     kwsys(Process_State_Exception)
-#define kwsysProcess_State_Executing     kwsys(Process_State_Executing)
-#define kwsysProcess_State_Exited        kwsys(Process_State_Exited)
-#define kwsysProcess_State_Expired       kwsys(Process_State_Expired)
-#define kwsysProcess_State_Killed        kwsys(Process_State_Killed)
-#define kwsysProcess_GetState            kwsys(Process_GetState)
-#define kwsysProcess_State_e             kwsys(Process_State_e)
-#define kwsysProcess_Exception_None      kwsys(Process_Exception_None)
-#define kwsysProcess_Exception_Fault     kwsys(Process_Exception_Fault)
-#define kwsysProcess_Exception_Illegal   kwsys(Process_Exception_Illegal)
-#define kwsysProcess_Exception_Interrupt kwsys(Process_Exception_Interrupt)
-#define kwsysProcess_Exception_Numerical kwsys(Process_Exception_Numerical)
-#define kwsysProcess_Exception_Other     kwsys(Process_Exception_Other)
-#define kwsysProcess_GetExitException    kwsys(Process_GetExitException)
-#define kwsysProcess_Exception_e         kwsys(Process_Exception_e)
-#define kwsysProcess_GetExitCode         kwsys(Process_GetExitCode)
-#define kwsysProcess_GetExitValue        kwsys(Process_GetExitValue)
-#define kwsysProcess_GetErrorString      kwsys(Process_GetErrorString)
-#define kwsysProcess_GetExceptionString  kwsys(Process_GetExceptionString)
-#define kwsysProcess_Execute             kwsys(Process_Execute)
-#define kwsysProcess_WaitForData         kwsys(Process_WaitForData)
-#define kwsysProcess_Pipes_e             kwsys(Process_Pipes_e)
-#define kwsysProcess_Pipe_None           kwsys(Process_Pipe_None)
-#define kwsysProcess_Pipe_STDIN          kwsys(Process_Pipe_STDIN)
-#define kwsysProcess_Pipe_STDOUT         kwsys(Process_Pipe_STDOUT)
-#define kwsysProcess_Pipe_STDERR         kwsys(Process_Pipe_STDERR)
-#define kwsysProcess_Pipe_Timeout        kwsys(Process_Pipe_Timeout)
-#define kwsysProcess_WaitForExit         kwsys(Process_WaitForExit)
-#define kwsysProcess_Kill                kwsys(Process_Kill)
+#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)
 
 #if defined(__cplusplus)
 extern "C"
diff --git a/Source/kwsys/ProcessWin32.c b/Source/kwsys/ProcessWin32.c
index 7f3b03f..9c86242 100644
--- a/Source/kwsys/ProcessWin32.c
+++ b/Source/kwsys/ProcessWin32.c
@@ -63,7 +63,7 @@ Q190351 and Q150956.
 /* The maximum amount to read from a pipe at a time.  */
 #define KWSYSPE_PIPE_BUFFER_SIZE 1024
 
-#define kwsysEncodedWriteArrayProcessFwd9x kwsys(EncodedWriteArrayProcessFwd9x)
+#define kwsysEncodedWriteArrayProcessFwd9x kw_sys(EncodedWriteArrayProcessFwd9x)
 
 typedef LARGE_INTEGER kwsysProcessTime;
 
diff --git a/Source/kwsys/ProcessWin32Kill.h.in b/Source/kwsys/ProcessWin32Kill.h.in
index dfd7df5..0ec15b3 100644
--- a/Source/kwsys/ProcessWin32Kill.h.in
+++ b/Source/kwsys/ProcessWin32Kill.h.in
@@ -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 kwsys(x) @KWSYS_NAMESPACE@##x
+#define kw_sys(x) @KWSYS_NAMESPACE@##x
 #define kwsysEXPORT                      @KWSYS_NAMESPACE@_EXPORT
-#define kwsysProcessWin32Kill            kwsys(ProcessWin32Kill)
+#define kwsysProcessWin32Kill            kw_sys(ProcessWin32Kill)
 
 #if defined(__cplusplus)
 extern "C"