--- rpl/src/rpl.h	2014/07/15 14:12:38	1.246
+++ rpl/src/rpl.h	2014/07/15 14:20:10	1.247
@@ -378,24 +378,26 @@ union semun
 
 #ifdef IPCS_SYSV
 #	ifdef DEBUG_SEMAPHORES
-#	define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
-			uprintf("[%d-%llu] Semaphore %s (%p) "\
-			"waiting at %s() " \
-			"line #%d\n", (int) getpid(), (unsigned long long) pthread_self(), \
-			#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-			if (value > 1) BUG(1, uprintf("Value %d\n", value)); \
-			sem_wait_SysV(a); })
+#		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"waiting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) i\
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 1) BUG(1, uprintf("Value %d\n", value)); \
+				sem_wait_SysV(a); })
 #	define sem_post(a) ({ int value; sem_getvalue(a, &value); \
-			uprintf("[%d-%llu] Semaphore %s (%p) "\
-			"posting at %s() " \
-			"line #%d\n", (int) getpid(), (unsigned long long) pthread_self(), \
-			#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-			if (value > 0) BUG(1, uprintf("Value %d\n", value)); \
-			sem_post_SysV(a); })
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"posting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 0) BUG(1, uprintf("Value %d\n", value)); \
+				sem_post_SysV(a); })
 #	define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
-			if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
-			sem_destroy_SysV(a); })
-#else
+				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
+				sem_destroy_SysV(a); })
+#	else
 #		define sem_destroy(a)		sem_destroy_SysV(a)
 #		define sem_wait(a)			sem_wait_SysV(a)
 #		define sem_post(a)			sem_post_SysV(a)
@@ -409,21 +411,25 @@ union semun
 #	define sem_close(a)			sem_close_SysV(a)
 #	define sem_unlink(a)		sem_unlink_SysV(a)
 #else
-#	define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
-			uprintf("[%d-%llu] Semaphore %s (%p) "\
-			"waiting at %s() " \
-			"line #%d\n", (int) getpid(), (unsigned long long) pthread_self(), \
-			#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-			if (value > 1) BUG(1, uprintf("Value %d\n", value)); sem_wait(a); })
-#	define sem_post(a) ({ int value; sem_getvalue(a, &value); \
-			uprintf("[%d-%llu] Semaphore %s (%p) "\
-			"posting at %s() " \
-			"line #%d\n", (int) getpid(), (unsigned long long) pthread_self(), \
-			#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-			if (value > 0) BUG(1, uprintf("Value %d\n", value)); sem_post(a); })
-#	define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
-			if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
-			sem_destroy(a); })
+#	ifdef DEBUG_SEMAPHORES
+#		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"waiting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 1) BUG(1, uprintf("Value %d\n", value)); sem_wait(a); })
+#		define sem_post(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"posting at %s() " \
+				"line #%d\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
+				if (value > 0) BUG(1, uprintf("Value %d\n", value)); sem_post(a); })
+#		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
+				sem_destroy(a); })
+#	endif
 #endif