a few fixes for cgraph merge

diff --git a/lib/common/usershape.h b/lib/common/usershape.h
index 42ad18c1763eb0c1429891cb8ac4dd763bf7a4ba..d562b17a7d384822168878b89f10b69cd3d068d8 100644 (file)
--- a/lib/common/usershape.h
+++ b/lib/common/usershape.h
@@ -40,7 +40,7 @@ extern "C" {
 
     struct usershape_s {
        Dtlink_t link;
-       char *name;
+       const char *name;
        int macro_id;
        boolean must_inline;
        boolean nocache;