3 files changed, 9 insertions, 9 deletions

diff --git a/emu/Nt/devfs.c b/emu/Nt/devfs.c
index 628d1ef9..6d79c35b 100644
--- a/emu/Nt/devfs.c
+++ b/emu/Nt/devfs.c
@@ -209,7 +209,7 @@ winfilematch(char *path, WIN32_FIND_DATA *data)
 		--p;
 	wpath = widen(p);
 	r = (data->cFileName[0] == '.' && runes16len(data->cFileName) == 1)
-			|| runescmp(data->cFileName, wpath) == 0;
+			|| runes16cmp(data->cFileName, wpath) == 0;
 	free(wpath);
 	return r;
 }
@@ -941,7 +941,7 @@ fswstat(Chan *c, uchar *buf, int n)
 		}
 	}
 	wpath = widen(dir.name);
-	nmatch = runescmp(wpath, data.cFileName);
+	nmatch = runes16cmp(wpath, data.cFileName);
 	free(wpath);
 	if(!emptystr(dir.name) && nmatch != 0){
 		if(!okelem(dir.name, 1))
@@ -1001,7 +1001,7 @@ fswstat(Chan *c, uchar *buf, int n)
 
 	/* do last so path is valid throughout */
 	wpath = widen(dir.name);
-	nmatch = runescmp(wpath, data.cFileName);
+	nmatch = runes16cmp(wpath, data.cFileName);
 	free(wpath);
 	if(!emptystr(dir.name) && nmatch != 0) {
 		ph = fswalkpath(FS(c)->name, "..", 1);
@@ -1596,7 +1596,7 @@ secinit(void)
 	fsuser = secuser();
 	if(fsuser == nil)
 		fsuser = fsnone;
-	else if(runescmp(fsuser->name, rootname) == 0
+	else if(runes16cmp(fsuser->name, rootname) == 0
 	     && OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)){
 		priv = (TOKEN_PRIVILEGES*)privrock;
 		priv->PrivilegeCount = 1;
@@ -2029,7 +2029,7 @@ domnametouser(Rune16 *srv, Rune16 *name, Rune16 *dom)
 
 	qlock(&users.lk);
 	for(u = users.u; u != 0; u = u->next)
-		if(runescmp(name, u->name) == 0 && runescmp(dom, u->dom) == 0)
+		if(runes16cmp(name, u->name) == 0 && runes16cmp(dom, u->dom) == 0)
 			break;
 	qunlock(&users.lk);
 	if(u == 0)
diff --git a/emu/Nt/r16.c b/emu/Nt/r16.c
index f8563b64..cdbc13ac 100644
--- a/emu/Nt/r16.c
+++ b/emu/Nt/r16.c
@@ -76,7 +76,7 @@ utftorunes16(Rune16 *r, char *p, int nc)
 }
 
 int
-runescmp(Rune16 *s1, Rune16 *s2)
+runes16cmp(Rune16 *s1, Rune16 *s2)
 {
 	Rune16 r1, r2;
 
diff --git a/emu/Nt/r16.h b/emu/Nt/r16.h
index fc991abb..4dbfa43f 100644
--- a/emu/Nt/r16.h
+++ b/emu/Nt/r16.h
@@ -4,7 +4,7 @@ typedef unsigned short Rune16;
 	char		*narrowen(wchar_t *ws);
 	int		widebytes(wchar_t *ws);
 	int		runes16len(Rune16*);
-	Rune16*	runes16dup(Rune*);
-	Rune16*	utftorunes16(Rune*, char*, int);
+	Rune16*	runes16dup(Rune16*);
+	Rune16*	utftorunes16(Rune16*, char*, int);
 	char*	runes16toutf(char*, Rune16*, int);
-	int		runescmp(Rune16*, Rune*);
+	int		runescmp(Rune16*, Rune16*);