diff --git a/src/common/qsw.c b/src/common/qsw.c
index 5a30c8342d2e58d1a157787f1240304c586bc304..2483a3670d07ce42b7808bc174b844b8e533da0a 100644
--- a/src/common/qsw.c
+++ b/src/common/qsw.c
@@ -100,17 +100,19 @@ struct qsw_jobinfo {
 /* Copy library state */
 #define _copy_libstate(dest, src) do { 			\
 	assert((src)->ls_magic == QSW_LIBSTATE_MAGIC); 	\
-	assert((dest)->ls_magic == QSW_LIBSTATE_MAGIC); 	\
+	assert((dest)->ls_magic == QSW_LIBSTATE_MAGIC); \
 	memcpy(dest, src, sizeof(struct qsw_libstate));	\
 } while (0)
 
 /* Lock on library state */
 #define _lock_qsw() do {				\
-	int err = pthread_mutex_lock(&qsw_lock);	\
+	int err;					\
+	err = pthread_mutex_lock(&qsw_lock);		\
 	assert(err == 0);				\
 } while (0)
 #define _unlock_qsw() do {				\
-	int err = pthread_mutex_unlock(&qsw_lock);	\
+	int err;					\
+	err = pthread_mutex_unlock(&qsw_lock);		\
 	assert(err == 0);				\
 } while (0)