Index: trunk/src/librnd/core/safe_fs.c
===================================================================
--- trunk/src/librnd/core/safe_fs.c	(revision 31017)
+++ trunk/src/librnd/core/safe_fs.c	(revision 31018)
@@ -252,7 +252,7 @@
 }
 
 
-DIR *pcb_opendir(rnd_hidlib_t *hidlib, const char *name)
+DIR *rnd_opendir(rnd_hidlib_t *hidlib, const char *name)
 {
 	DIR *d;
 	char *path_exp = rnd_build_fn(hidlib, name);
@@ -263,12 +263,12 @@
 	return d;
 }
 
-struct dirent *pcb_readdir(DIR *dir)
+struct dirent *rnd_readdir(DIR *dir)
 {
 	return readdir(dir);
 }
 
-int pcb_closedir(DIR *dir)
+int rnd_closedir(DIR *dir)
 {
 	return closedir(dir);
 }
@@ -295,11 +295,11 @@
 	if (!recursive)
 		return NULL;
 
-	d = pcb_opendir(hidlib, from);
+	d = rnd_opendir(hidlib, from);
 	if (d == NULL)
 		return NULL;
 
-	while((de = pcb_readdir(d)) != NULL) {
+	while((de = rnd_readdir(d)) != NULL) {
 		struct stat st;
 		if (de->d_name[0] == '.')
 			continue;
Index: trunk/src/librnd/core/safe_fs_dir.h
===================================================================
--- trunk/src/librnd/core/safe_fs_dir.h	(revision 31017)
+++ trunk/src/librnd/core/safe_fs_dir.h	(revision 31018)
@@ -1,4 +1,4 @@
 #include <librnd/core/compat_inc.h>
-DIR *pcb_opendir(rnd_hidlib_t *hidlib, const char *name);
-struct dirent *pcb_readdir(DIR *dir);
-int pcb_closedir(DIR *dir);
+DIR *rnd_opendir(rnd_hidlib_t *hidlib, const char *name);
+struct dirent *rnd_readdir(DIR *dir);
+int rnd_closedir(DIR *dir);
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31017)
+++ trunk/src/librnd/pcb_compat.h	(revision 31018)
@@ -1104,3 +1104,6 @@
 #define pcb_fopen_fn rnd_fopen_fn
 #define pcb_fopen_at rnd_fopen_at
 #define pcb_fopen_first rnd_fopen_first
+#define pcb_opendir rnd_opendir
+#define pcb_readdir rnd_readdir
+#define pcb_closedir rnd_closedir
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 31017)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 31018)
@@ -156,7 +156,7 @@
 	fn_end = fn + l + 1;
 
 	/* First try opening the directory specified by path */
-	if ((subdirobj = pcb_opendir(&PCB->hidlib, new_subdir)) == NULL) {
+	if ((subdirobj = rnd_opendir(&PCB->hidlib, new_subdir)) == NULL) {
 		rnd_opendir_error_message(new_subdir);
 		if (chdir(olddir))
 			rnd_chdir_error_message(olddir);
@@ -166,7 +166,7 @@
 	/* Now loop over files in this directory looking for files.
 	 * We ignore certain files which are not footprints.
 	 */
-	while ((subdirentry = pcb_readdir(subdirobj)) != NULL) {
+	while ((subdirentry = rnd_readdir(subdirobj)) != NULL) {
 #ifdef DEBUG
 /*    printf("...  Examining file %s ... \n", subdirentry->d_name); */
 #endif
@@ -223,7 +223,7 @@
 		}
 	}
 	/* Done.  Clean up, cd back into old dir, and return */
-	pcb_closedir(subdirobj);
+	rnd_closedir(subdirobj);
 	if (chdir(olddir))
 		rnd_chdir_error_message(olddir);
 	return n_footprints;
Index: trunk/src_plugins/script/live_script.c
===================================================================
--- trunk/src_plugins/script/live_script.c	(revision 31017)
+++ trunk/src_plugins/script/live_script.c	(revision 31018)
@@ -106,7 +106,7 @@
 		char fn[RND_PATH_MAX*2], *fn_end;
 		int dirlen;
 		struct dirent *de;
-		DIR *d = pcb_opendir(hl, *path);
+		DIR *d = rnd_opendir(hl, *path);
 
 		if (d == NULL)
 			continue;
@@ -117,7 +117,7 @@
 		*fn_end = RND_DIR_SEPARATOR_C;
 		fn_end++;
 
-		while((de = pcb_readdir(d)) != NULL) {
+		while((de = rnd_readdir(d)) != NULL) {
 			FILE *f;
 			int el, len = strlen(de->d_name);
 			char *s1, *s2, *eng, *s, *end, line[1024];
@@ -150,7 +150,7 @@
 			}
 			fclose(f);
 		}
-		pcb_closedir(d);
+		rnd_closedir(d);
 	}
 	lvs->langs = (char **)vl.array;
 	lvs->lang_engines = (char **)ve.array;