From a21b0024efcf084eb05e6e4256972820ff088af2 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sat, 21 May 2011 18:48:24 +0200
Subject: [PATCH] pointless name collision

---
 world/net/psyc/circuit.c | 4 ++--
 world/net/psyc/library.i | 4 ++--
 world/net/psyc/render.i  | 4 ++--
 world/net/spyc/circuit.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/world/net/psyc/circuit.c b/world/net/psyc/circuit.c
index 96f6406..e35d28b 100644
--- a/world/net/psyc/circuit.c
+++ b/world/net/psyc/circuit.c
@@ -365,10 +365,10 @@ varargs int msg(string source, string mc, string data,
 		if (target) buf += ":_target\t"+ target +"\n";
 	}
 #endif /* !NEW_RENDER */
-	rc = psyc_render(source, mc, data, vars, showingLog, target);
+	rc = render_psyc(source, mc, data, vars, showingLog, target);
 	unless (rc) return 0;
 	buf += rc;
-	P4(("psyc_render %O for %O\n", rc, buf))
+	P4(("render_psyc %O for %O\n", rc, buf))
 #if 0
 # ifdef NEW_LINE
 	buf += "\n" S_GLYPH_PACKET_DELIMITER "\n";
diff --git a/world/net/psyc/library.i b/world/net/psyc/library.i
index 5b5d192..175f968 100644
--- a/world/net/psyc/library.i
+++ b/world/net/psyc/library.i
@@ -398,11 +398,11 @@ int psyc_sendmsg(mixed target, string mc, mixed data, mapping vars,
 	    buf = S_GLYPH_PACKET_DELIMITER "\n"
 		  ":_source\t"+ sname +"\n"
 		  ":_target\t"+ target +"\n";
-	t = psyc_render(source, mc, data, vars, showingLog, target);
+	t = render_psyc(source, mc, data, vars, showingLog, target);
 	unless (t) return 0;
 	buf += t;
 #else
-	buf = psyc_render(source, mc, data, vars, showingLog, target);
+	buf = render_psyc(source, mc, data, vars, showingLog, target);
 	unless (buf) return 0;
 #endif /* NEW_RENDER */
 
diff --git a/world/net/psyc/render.i b/world/net/psyc/render.i
index 2878299..9af5c73 100644
--- a/world/net/psyc/render.i
+++ b/world/net/psyc/render.i
@@ -138,10 +138,10 @@ static int build_header(string key, mixed val, mapping vars) {
 	return 0;
 }
 
-static varargs string psyc_render(mixed source, string mc, mixed data,
+static varargs string render_psyc(mixed source, string mc, mixed data,
 			      mapping vars, int showingLog, vastring target) {
 		  // vaobject obj, vastring target, vaint hascontext)
-	P4(("%O psyc_render %O for %O\n", ME, vars, previous_object()))
+	P4(("%O render_psyc %O for %O\n", ME, vars, previous_object()))
 	string t, context;
 	int needLen = 0;
 #ifndef NEW_LINE
diff --git a/world/net/spyc/circuit.c b/world/net/spyc/circuit.c
index 915747d..e49851a 100644
--- a/world/net/spyc/circuit.c
+++ b/world/net/spyc/circuit.c
@@ -322,7 +322,7 @@ varargs int msg(string source, string mc, string data,
     string buf = "";
 
     unless(vars) vars = ([ ]);
-    buf = psyc_render(source, mc, data, vars, showingLog, target);
+    buf = render_psyc(source, mc, data, vars, showingLog, target);
 #ifdef _flag_log_sockets_SPYC
     log_file("RAW_SPYC", "« %O\n%s\n", ME, buf);
 #endif