[Libvirt-cim] [PATCH 2 of 2] [CU] Rename STRING() macro in libcmpiutil

[Dan Smith]

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1202512525 28800
# Node ID 2337330e5a9bc8e71afd04627166155a33dc53f2
# Parent  79271d1d325748849dc312a51053ef680eb98b86
[CU] Rename STRING() macro in libcmpiutil

We really shouldn't define a macro with such a blatantly common name.
I don't think this actually got used anywhere, but I think it's worth
keeping (under a reasonable name)

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 79271d1d3257 -r 2337330e5a9b libcmpiutil.h
--- a/libcmpiutil.h	Fri Feb 08 15:15:15 2008 -0800
+++ b/libcmpiutil.h	Fri Feb 08 15:15:25 2008 -0800
@@ -44,15 +44,16 @@
 
 #define STREQ(a, b) (strcmp(a, b) == 0)
 #define STREQC(a, b) (strcasecmp(a, b) == 0)
-#define _STRINGIFY(x) #x
-#define STRING(x) _STRINGIFY(x)
+#define _CU_STRINGIFY(x) #x
+#define CU_STRINGIFY(x) _CU_STRINGIFY(x)
 
 /**
  * Dispatch macro for debug_print, fills in the function name and line number 
  * of caller.
  */
-#define CU_DEBUG(fmt, args...) {debug_print(__FILE__ "(" STRING(__LINE__)"): " \
-                                            fmt "\n", ##args);}
+#define CU_DEBUG(fmt, args...) {                                        \
+                debug_print(__FILE__ "(" CU_STRINGIFY(__LINE__)"): "    \
+                            fmt "\n", ##args);}
 
 /**
  * Helper for DEBUG macro.  Checks environmental variable CU_DEBUG and: