From 103e0bd10db269fc614dbcdfb226a4255ec53865 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 9 Oct 2011 19:19:32 +0000
Subject: [PATCH] Nested macro goodness.

---
 src/sbbs3/sbbs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index febbf15958..f4c2829e34 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -126,14 +126,14 @@ extern int	thread_suid_broken;			/* NPTL is no longer broken */
 { \
 	size_t			len; \
 	size_t			pos; \
-	const jschar	*val; \
+	const jschar	*strval; \
 \
 	ret=NULL; \
 	if(str != NULL) { \
-		if((val=JS_GetStringCharsAndLength(cx, str, &len))) { \
+		if((strval=JS_GetStringCharsAndLength(cx, str, &len))) { \
 			if((ret=(char *)alloca(len+1))) { \
 				for(pos=0; pos<len; pos++) \
-					ret[pos]=val[pos]; \
+					ret[pos]=strval[pos]; \
 				ret[len]=0; \
 			} \
 		} \
@@ -142,7 +142,7 @@ extern int	thread_suid_broken;			/* NPTL is no longer broken */
 
 #define JSVALUE_TO_STRING(cx, val, ret) \
 { \
-	JSString	str=JS_ValueToString(cx, val); \
+	JSString	*str=JS_ValueToString(cx, val); \
 	JSSTRING_TO_STRING(cx, str, ret); \
 }
 
-- 
GitLab