Commit 9cfc4dee authored by Tom Lane's avatar Tom Lane

Make CppAsString2() more visible in c.h.

For some reason this standard C string-processing hack was buried in an
NLS-related section of c.h.  Put it beside CppAsString() so that people
are more likely to find it and not be tempted to reinvent local copies,
as I nearly did.  And provide a more helpful comment, too.
parent 7666e73a
...@@ -149,6 +149,8 @@ ...@@ -149,6 +149,8 @@
/* /*
* CppAsString * CppAsString
* Convert the argument to a string, using the C preprocessor. * Convert the argument to a string, using the C preprocessor.
* CppAsString2
* Convert the argument to a string, after one round of macro expansion.
* CppConcat * CppConcat
* Concatenate two arguments together, using the C preprocessor. * Concatenate two arguments together, using the C preprocessor.
* *
...@@ -157,6 +159,7 @@ ...@@ -157,6 +159,7 @@
* backward compatibility with existing PostgreSQL code. * backward compatibility with existing PostgreSQL code.
*/ */
#define CppAsString(identifier) #identifier #define CppAsString(identifier) #identifier
#define CppAsString2(x) CppAsString(x)
#define CppConcat(x, y) x##y #define CppConcat(x, y) x##y
/* /*
...@@ -1002,10 +1005,6 @@ typedef NameData *Name; ...@@ -1002,10 +1005,6 @@ typedef NameData *Name;
* *
* Make sure this matches the installation rules in nls-global.mk. * Make sure this matches the installation rules in nls-global.mk.
*/ */
/* need a second indirection because we want to stringize the macro value, not the name */
#define CppAsString2(x) CppAsString(x)
#ifdef SO_MAJOR_VERSION #ifdef SO_MAJOR_VERSION
#define PG_TEXTDOMAIN(domain) (domain CppAsString2(SO_MAJOR_VERSION) "-" PG_MAJORVERSION) #define PG_TEXTDOMAIN(domain) (domain CppAsString2(SO_MAJOR_VERSION) "-" PG_MAJORVERSION)
#else #else
......
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