Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 30914)
+++ trunk/scconfig/Rev.h	(revision 30915)
@@ -1 +1 @@
-static const int myrev = 30914;
+static const int myrev = 30915;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 30914)
+++ trunk/scconfig/Rev.tab	(revision 30915)
@@ -1,4 +1,4 @@
-30914	configure	pcb_ -> rnd_ renames in librnd
+30915	configure	pcb_ -> rnd_ renames in librnd
 30779	configure	remove distaligntext - all cases handled by distalign properly
 30754	configure	remove the old import_sch plugin (in favor of import_sch2)
 30753	configure	disable the old drc, enable the new drc
Index: trunk/src/librnd/config.h.in
===================================================================
--- trunk/src/librnd/config.h.in	(revision 30914)
+++ trunk/src/librnd/config.h.in	(revision 30915)
@@ -41,19 +41,19 @@
 print {#define RND_INLINE static RND_INLINE_DETECTED PCB_FUNC_UNUSED\n\n}
 
 print {\n\n/* Wether setenv() works */\n}
-print_ternary ?libs/env/setenv/presents {#define PCB_HAVE_SETENV 1} {/* #undef PCB_HAVE_SETENV */}
+print_ternary ?libs/env/setenv/presents {#define RND_HAVE_SETENV 1} {/* #undef RND_HAVE_SETENV */}
 
 print {\n\n/* Wether putenv() works */\n}
-print_ternary ?libs/env/putenv/presents {#define PCB_HAVE_PUTENV 1} {/* #undef PCB_HAVE_PUTENV */}
+print_ternary ?libs/env/putenv/presents {#define RND_HAVE_PUTENV 1} {/* #undef RND_HAVE_PUTENV */}
 
 print {\n\n/* Wether usleep() works */\n}
-print_ternary ?libs/time/usleep/presents {#define PCB_HAVE_USLEEP 1} {/* #undef PCB_HAVE_USLEEP */}
+print_ternary ?libs/time/usleep/presents {#define RND_HAVE_USLEEP 1} {/* #undef RND_HAVE_USLEEP */}
 
 print {\n\n/* Wether win32 Sleep() works */\n}
-print_ternary ?libs/time/Sleep/presents {#define PCB_HAVE_WSLEEP 1} {/* #undef PCB_HAVE_WSLEEP */}
+print_ternary ?libs/time/Sleep/presents {#define RND_HAVE_WSLEEP 1} {/* #undef RND_HAVE_WSLEEP */}
 
 print {\n\n/* Wether select() works */\n}
-print_ternary ?libs/socket/select/presents {#define PCB_HAVE_SELECT 1} {/* #undef PCB_HAVE_SELECT */}
+print_ternary ?libs/socket/select/presents {#define RND_HAVE_SELECT 1} {/* #undef RND_HAVE_SELECT */}
 
 print {\n\n/* Define to 1 if you have the `snprintf' function. */\n}
 print_ternary ?libs/snprintf {#define HAVE_SNPRINTF 1} {/* #undef HAVE_SNPRINTF */}
Index: trunk/src/librnd/core/compat_misc.c
===================================================================
--- trunk/src/librnd/core/compat_misc.c	(revision 30914)
+++ trunk/src/librnd/core/compat_misc.c	(revision 30915)
@@ -166,16 +166,16 @@
 	return tolower(*s1) - tolower(*s2);
 }
 
-#ifdef PCB_HAVE_SETENV
+#ifdef RND_HAVE_SETENV
 	extern int setenv();
 #endif
 
 int pcb_setenv(const char *name, const char *val, int overwrite)
 {
-#ifdef PCB_HAVE_SETENV
+#ifdef RND_HAVE_SETENV
 	return setenv(name, val, overwrite);
 #else
-#	ifdef PCB_HAVE_PUTENV
+#	ifdef RND_HAVE_PUTENV
 	int res;
 	gds_t tmp;
 	gds_init(&tmp);
@@ -202,13 +202,13 @@
 
 void pcb_ms_sleep(long ms)
 {
-#ifdef PCB_HAVE_USLEEP
+#ifdef RND_HAVE_USLEEP
 	usleep(ms*1000);
 #else
-#	ifdef PCB_HAVE_WSLEEP
+#	ifdef RND_HAVE_WSLEEP
 		Sleep(ms);
 #	else
-#		ifdef PCB_HAVE_SELECT
+#		ifdef RND_HAVE_SELECT
 			fd_set s;
 			struct timeval tv;
 
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30914)
+++ trunk/src/librnd/pcb_compat.h	(revision 30915)
@@ -121,3 +121,9 @@
 #define pcb_distance rnd_distance
 #define pcb_cardinal_t rnd_cardinal_t
 #define PCB_INLINE RND_INLINE
+#define PCB_FUNC_UNUSED RND_FUNC_UNUSED
+#define PCB_HAVE_SETENV RND_HAVE_SETENV
+#define PCB_HAVE_PUTENV RND_HAVE_PUTENV
+#define PCB_HAVE_USLEEP RND_HAVE_USLEEP
+#define PCB_HAVE_WSLEEP RND_HAVE_WSLEEP
+#define PCB_HAVE_SELECT RND_HAVE_SELECT
Index: trunk/util/devhelpers/rename.sh
===================================================================
--- trunk/util/devhelpers/rename.sh	(revision 30914)
+++ trunk/util/devhelpers/rename.sh	(revision 30915)
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 find . -name '*.[chly]' -exec sed -i "$@" {} \;
+find . -name 'config.h.in' -exec sed -i "$@" {} \;