Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5072)
+++ trunk/doc-rnd/hacking/renames	(revision 5073)
@@ -1135,3 +1135,5 @@
 R_DIR_FOUND_CONTINUE -> PCB_R_DIR_FOUND_CONTINUE
 R_DIR_CANCEL -> PCB_R_DIR_CANCEL
 SLOP -> PCB_SLOP
+SM_REGEX -> PCB_SM_REGEX
+SM_LIST -> PCB_SM_LIST
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 5072)
+++ trunk/src/select.c	(revision 5073)
@@ -814,7 +814,7 @@
  * returns pcb_true if any object has been selected
  */
 #define REGEXEC(arg) \
-	(method == SM_REGEX ? regexec_match_all(regex, (arg)) : strlst_match(pat, (arg)))
+	(method == PCB_SM_REGEX ? regexec_match_all(regex, (arg)) : strlst_match(pat, (arg)))
 
 static int regexec_match_all(re_sei_t *preg, const char *string)
 {
@@ -838,7 +838,7 @@
 	char *pattern_copy = NULL;
 	re_sei_t *regex;
 
-	if (method == SM_REGEX) {
+	if (method == PCB_SM_REGEX) {
 		/* compile the regular expression */
 		regex = re_sei_comp(name_pattern);
 		if (re_sei_errno(regex) != 0) {
@@ -998,7 +998,7 @@
 		pcb_conn_lookup_uninit();
 	}
 
-	if (method == SM_REGEX)
+	if (method == PCB_SM_REGEX)
 		re_sei_free(regex);
 
 	if (changed) {
Index: trunk/src/select.h
===================================================================
--- trunk/src/select.h	(revision 5072)
+++ trunk/src/select.h	(revision 5073)
@@ -47,8 +47,8 @@
 
 
 typedef enum {
-	SM_REGEX = 0,
-	SM_LIST = 1
+	PCB_SM_REGEX = 0,
+	PCB_SM_LIST = 1
 } pcb_search_method_t;
 
 pcb_bool pcb_select_object_by_name(int, const char *, pcb_bool, pcb_search_method_t);
Index: trunk/src/select_act.c
===================================================================
--- trunk/src/select_act.c	(revision 5072)
+++ trunk/src/select_act.c	(revision 5073)
@@ -155,7 +155,7 @@
 		commonByName:
 			{
 				const char *pattern = PCB_ACTION_ARG(1);
-				pcb_search_method_t method = SM_REGEX;
+				pcb_search_method_t method = PCB_SM_REGEX;
 
 				if (pattern || (pattern = gui_get_pat(&method)) != NULL) {
 					if (pcb_select_object_by_name(type, pattern, pcb_true, method))
@@ -314,7 +314,7 @@
 		commonByName:
 			{
 				const char *pattern = PCB_ACTION_ARG(1);
-				pcb_search_method_t method = SM_REGEX;
+				pcb_search_method_t method = PCB_SM_REGEX;
 
 				if (pattern || (pattern = gui_get_pat(&method)) != NULL) {
 					if (pcb_select_object_by_name(type, pattern, pcb_false, method))