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.
2009-04-14 09:35:56 -04:00 · 2009-04-14 09:35:56 -04:00 · 19d11e2a1f
parent 63a1e45076
commit 19d11e2a1f
9 changed files with 264 additions and 235 deletions
--- a/Source/kwsys/Base64.h.in
+++ b/Source/kwsys/Base64.h.in
@ -24,6 +24,7 @@
 # define kwsys_ns(x) @KWSYS_NAMESPACE@##x
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif
+#if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 # define kwsysBase64          kwsys_ns(Base64)
 # define kwsysBase64_Decode   kwsys_ns(Base64_Decode)
 # define kwsysBase64_Decode3  kwsys_ns(Base64_Decode3)
@ -31,6 +32,7 @@
 # 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)
 extern "C"
@ -106,6 +108,7 @@ kwsysEXPORT unsigned long kwsysBase64_Decode(const unsigned char *input,
 #if !defined(KWSYS_NAMESPACE)
 # undef kwsys_ns
 # undef kwsysEXPORT
+# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 #  undef kwsysBase64
 #  undef kwsysBase64_Decode
 #  undef kwsysBase64_Decode3
@ -114,5 +117,6 @@ kwsysEXPORT unsigned long kwsysBase64_Decode(const unsigned char *input,
 #  undef kwsysBase64_Encode2
 #  undef kwsysBase64_Encode3
 # endif
+#endif

 #endif
--- a/Source/kwsys/Configure.h.in
+++ b/Source/kwsys/Configure.h.in
@ -22,6 +22,9 @@
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif

+/* Whether kwsys namespace is "kwsys".  */
+#define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
+
 /* If we are building a kwsys .c or .cxx file, suppress the Microsoft
   deprecation warnings.  */
 #if defined(KWSYS_NAMESPACE)
--- a/Source/kwsys/Configure.hxx.in
+++ b/Source/kwsys/Configure.hxx.in
@ -17,9 +17,6 @@
 /* Include C configuration.  */
 #include <@KWSYS_NAMESPACE@/Configure.h>

-/* Whether kwsys namespace is "kwsys".  */
-#define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
-
 /* Whether ANSI C++ stream headers are to be used.  */
 #define @KWSYS_NAMESPACE@_IOS_USE_ANSI @KWSYS_IOS_USE_ANSI@

--- a/Source/kwsys/FundamentalType.h.in
+++ b/Source/kwsys/FundamentalType.h.in
@ -24,6 +24,8 @@
 # define kwsys_ns(x) @KWSYS_NAMESPACE@##x
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif
+
+#if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 # define kwsysFundamentalType        kwsys_ns(FundamentalType)
 # define kwsysFundamentalType_Int8   kwsys_ns(FundamentalType_Int8)
 # define kwsysFundamentalType_UInt8  kwsys_ns(FundamentalType_UInt8)
@ -33,6 +35,7 @@
 # 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.  */
 #define @KWSYS_NAMESPACE@_SIZEOF_CHAR @KWSYS_SIZEOF_CHAR@
@ -114,6 +117,7 @@ typedef unsigned __int64 kwsysFundamentalType_UInt64;
 #if !defined(KWSYS_NAMESPACE)
 # undef kwsys_ns
 # undef kwsysEXPORT
+# if !defined(KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 #  undef kwsysFundamentalType
 #  undef kwsysFundamentalType_Int8
 #  undef kwsysFundamentalType_UInt8
@ -124,6 +128,7 @@ typedef unsigned __int64 kwsysFundamentalType_UInt64;
 #  undef kwsysFundamentalType_Int64
 #  undef kwsysFundamentalType_UInt64
 # endif
+#endif

 /* If building a C or C++ file in kwsys itself, give the source file
   access to the configured macros without a configured namespace.  */
--- a/Source/kwsys/MD5.h.in
+++ b/Source/kwsys/MD5.h.in
@ -24,6 +24,7 @@
 # define kwsys_ns(x) @KWSYS_NAMESPACE@##x
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif
+#if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 # define kwsysMD5                 kwsys_ns(MD5)
 # define kwsysMD5_s               kwsys_ns(MD5_s)
 # define kwsysMD5_New             kwsys_ns(MD5_New)
@ -33,6 +34,7 @@
 # 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)
 extern "C"
@ -91,6 +93,7 @@ kwsysEXPORT void kwsysMD5_DigestToHex(unsigned char const digest[16],
 #if !defined(KWSYS_NAMESPACE)
 # undef kwsys_ns
 # undef kwsysEXPORT
+# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 #  undef kwsysMD5
 #  undef kwsysMD5_s
 #  undef kwsysMD5_New
@ -101,5 +104,6 @@ kwsysEXPORT void kwsysMD5_DigestToHex(unsigned char const digest[16],
 #  undef kwsysMD5_FinalizeHex
 #  undef kwsysMD5_DigestToHex
 # endif
+#endif

 #endif
--- a/Source/kwsys/Process.h.in
+++ b/Source/kwsys/Process.h.in
@ -24,6 +24,7 @@
 # define kwsys_ns(x) @KWSYS_NAMESPACE@##x
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif
+#if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 # define kwsysProcess                     kwsys_ns(Process)
 # define kwsysProcess_s                   kwsys_ns(Process_s)
 # define kwsysProcess_New                 kwsys_ns(Process_New)
@ -75,6 +76,7 @@
 # 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)
 extern "C"
@ -370,6 +372,7 @@ kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
 #if !defined(KWSYS_NAMESPACE)
 # undef kwsys_ns
 # undef kwsysEXPORT
+# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 #  undef kwsysProcess
 #  undef kwsysProcess_s
 #  undef kwsysProcess_New
@ -422,5 +425,6 @@ kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
 #  undef kwsysProcess_WaitForExit
 #  undef kwsysProcess_Kill
 # endif
+#endif

 #endif
--- a/Source/kwsys/String.h.in
+++ b/Source/kwsys/String.h.in
@ -26,8 +26,10 @@
 # define kwsys_ns(x) @KWSYS_NAMESPACE@##x
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif
+#if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 # define kwsysString_strcasecmp                kwsys_ns(String_strcasecmp)
 # define kwsysString_strncasecmp               kwsys_ns(String_strncasecmp)
+#endif

 #if defined(__cplusplus)
 extern "C"
@ -58,8 +60,10 @@ kwsysEXPORT int kwsysString_strncasecmp(const char* lhs, const char* rhs,
 #if !defined(KWSYS_NAMESPACE)
 # undef kwsys_ns
 # undef kwsysEXPORT
+# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 #  undef kwsysString_strcasecmp
 #  undef kwsysString_strncasecmp
 # endif
+#endif

 #endif
--- a/Source/kwsys/System.h.in
+++ b/Source/kwsys/System.h.in
@ -24,6 +24,7 @@
 # define kwsys_ns(x) @KWSYS_NAMESPACE@##x
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif
+#if !@KWSYS_NAMESPACE@_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)
@ -36,6 +37,7 @@
 # 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)
 extern "C"
@ -111,6 +113,7 @@ enum kwsysSystem_Shell_Flag_e
 #if !defined(KWSYS_NAMESPACE)
 # undef kwsys_ns
 # undef kwsysEXPORT
+# if !defined(KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 #  undef kwsysSystem_Shell_GetArgumentForWindows
 #  undef kwsysSystem_Shell_GetArgumentForUnix
 #  undef kwsysSystem_Shell_GetArgumentSizeForWindows
@ -124,5 +127,6 @@ enum kwsysSystem_Shell_Flag_e
 #  undef kwsysSystem_Shell_Flag_NMake
 #  undef kwsysSystem_Shell_Flag_AllowMakeVariables
 # endif
+#endif

 #endif
--- a/Source/kwsys/Terminal.h.in
+++ b/Source/kwsys/Terminal.h.in
@ -26,6 +26,7 @@
 # define kwsys_ns(x) @KWSYS_NAMESPACE@##x
 # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
 #endif
+#if !@KWSYS_NAMESPACE@_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)
@ -52,6 +53,7 @@
 # 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)
 extern "C"
@ -126,6 +128,7 @@ enum kwsysTerminal_Color_e
 #if !defined(KWSYS_NAMESPACE)
 # undef kwsys_ns
 # undef kwsysEXPORT
+# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
 #  undef kwsysTerminal_cfprintf
 #  undef kwsysTerminal_Color_e
 #  undef kwsysTerminal_Color_Normal
@ -153,5 +156,6 @@ enum kwsysTerminal_Color_e
 #  undef kwsysTerminal_Color_AssumeVT100
 #  undef kwsysTerminal_Color_AttributeMask
 # endif
+#endif

 #endif