Index: trunk/src/attrib.c
===================================================================
--- trunk/src/attrib.c	(revision 24476)
+++ trunk/src/attrib.c	(revision 24477)
@@ -40,7 +40,7 @@
 		list->post_change(list, name, value); \
 } while(0)
 
-char *pcb_attribute_get(pcb_attribute_list_t * list, const char *name)
+char *pcb_attribute_get(const pcb_attribute_list_t *list, const char *name)
 {
 	int i;
 	for (i = 0; i < list->Number; i++)
Index: trunk/src/attrib.h
===================================================================
--- trunk/src/attrib.h	(revision 24476)
+++ trunk/src/attrib.h	(revision 24477)
@@ -47,7 +47,7 @@
 
 /* Returns NULL if the name isn't found, else the value for that named
    attribute.  */
-char *pcb_attribute_get(pcb_attribute_list_t * list, const char *name);
+char *pcb_attribute_get(const pcb_attribute_list_t *list, const char *name);
 
 /* Adds an attribute to the list.  If the attribute already exists, the value
    is replaced. Returns non-zero if an existing attribute was replaced.  */
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 24476)
+++ trunk/src/draw.c	(revision 24477)
@@ -1027,7 +1027,7 @@
 	expose_end(&save);
 }
 
-static const char *lab_with_intconn(pcb_any_obj_t *term, int intconn, const char *lab, char *buff, int bufflen)
+static const char *lab_with_intconn(const pcb_any_obj_t *term, int intconn, const char *lab, char *buff, int bufflen)
 {
 	if ((conf_core.editor.term_id != NULL) && (*conf_core.editor.term_id != '\0')) {
 		gds_t tmp;
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 24476)
+++ trunk/src/obj_text.c	(revision 24477)
@@ -172,7 +172,7 @@
 
 static int pcb_text_render_str_cb(void *ctx, gds_t *s, const char **input)
 {
-	pcb_text_t *text = ctx;
+	const pcb_text_t *text = ctx;
 	char *end, key[128], *path, *attrs;
 	size_t len;
 
@@ -186,7 +186,7 @@
 	*input += len+1;
 
 	if ((key[0] == 'a') && (key[1] == '.')) {
-		pcb_attribute_list_t *attr = &text->Attributes;
+		const pcb_attribute_list_t *attr = &text->Attributes;
 		path = key+2;
 		if ((path[0] == 'p') && (memcmp(path, "parent.", 7) == 0)) {
 			pcb_data_t *par = text->parent.layer->parent.data;
@@ -230,9 +230,9 @@
 	return res;
 }
 
-int pcb_append_dyntext(gds_t *dst, pcb_any_obj_t *obj, const char *fmt)
+int pcb_append_dyntext(gds_t *dst, const pcb_any_obj_t *obj, const char *fmt)
 {
-	return pcb_subst_append(dst, fmt, pcb_text_render_str_cb, obj, PCB_SUBST_PERCENT | PCB_SUBST_CONF, 0);
+	return pcb_subst_append(dst, fmt, pcb_text_render_str_cb, (void *)obj, PCB_SUBST_PERCENT | PCB_SUBST_CONF, 0);
 }
 
 /* Free rendered if it was allocated */
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 24476)
+++ trunk/src/obj_text.h	(revision 24477)
@@ -101,7 +101,7 @@
 unsigned int pcb_text_hash(const pcb_host_trans_t *tr, const pcb_text_t *t);
 
 /* Append dyntext fmt rendered from the perspective of obj */
-int pcb_append_dyntext(gds_t *dst, pcb_any_obj_t *obj, const char *fmt);
+int pcb_append_dyntext(gds_t *dst, const pcb_any_obj_t *obj, const char *fmt);
 
 void pcb_text_init(void);
 void pcb_text_uninit(void);