Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 32554)
+++ trunk/src/obj_line.c	(revision 32555)
@@ -177,7 +177,7 @@
 	jmp_buf env;
 };
 
-RND_INLINE int can_merge_lines(const pcb_line_t *old_line, const pcb_line_t *new_line, pcb_line_t *out)
+RND_INLINE pcb_line_merge_t can_merge_lines(const pcb_line_t *old_line, const pcb_line_t *new_line, pcb_line_t *out)
 {
 	/* do not merge to subc parts or terminals */
 	if ((pcb_obj_parent_subc((pcb_any_obj_t *)old_line) != NULL) || (old_line->term != NULL))
@@ -238,7 +238,7 @@
 	return PCB_LINMER_NONE;
 }
 
-int pcb_line_can_merge_lines(const pcb_line_t *old_line, const pcb_line_t *new_line, pcb_line_t *out)
+pcb_line_merge_t pcb_line_can_merge_lines(const pcb_line_t *old_line, const pcb_line_t *new_line, pcb_line_t *out)
 {
 	return can_merge_lines(old_line, new_line, out);
 }
Index: trunk/src/obj_line.h
===================================================================
--- trunk/src/obj_line.h	(revision 32554)
+++ trunk/src/obj_line.h	(revision 32555)
@@ -123,7 +123,7 @@
 	PCB_LINMER_SKIP  = 2  /* do not create the new line at all */
 } pcb_line_merge_t;
 
-int pcb_line_can_merge_lines(const pcb_line_t *old_line, const pcb_line_t *new_line, pcb_line_t *out);
+pcb_line_merge_t pcb_line_can_merge_lines(const pcb_line_t *old_line, const pcb_line_t *new_line, pcb_line_t *out);
 
 
 /* Rather than mode the line bounding box, we set it so the point bounding