Merge branch 'master' into cpp

include/misc.h

@@ -1,7 +1,7 @@
 #ifndef INCLUDE_MISC_H
 #define INCLUDE_MISC_H
 
-#define min(a, b) (((a) < b) ? (a) : (b))
+#define min(a, b) (((a) < (b)) ? (a) : (b))
 #define max(a, b) (((a) > (b)) ? (a) : (b))
 
 #endif