TBB patch: don't #define min

kevinushey · kevinushey · commit 38334d7fb15e · 2016-05-04T10:38:37.000-07:00
diff --git a/src/tbb/src/tbb/tools_api/ittnotify_static.c b/src/tbb/src/tbb/tools_api/ittnotify_static.c
@@ -806,10 +806,8 @@ static const char* __itt_get_lib_name(void)
     return lib_name;
 }
 
-#ifndef min
-#define min(a,b) (a) < (b) ? (a) : (b)
-#endif /* min */
-
+/* PATCH: Avoid stomping on 'min()' definition */
+#define RCPP_PARALLEL_TBB_MIN(a, b) (a) < (b) ? (a) : (b)
 static __itt_group_id __itt_get_groups(void)
 {
     int i;
@@ -825,7 +823,7 @@ static __itt_group_id __itt_get_groups(void)
         while ((group_str = __itt_fsplit(group_str, ",; ", &chunk, &len)) != NULL)
         {
             __itt_fstrcpyn(gr, chunk, sizeof(gr) - 1);
-            gr[min(len, (int)(sizeof(gr) - 1))] = 0;
+            gr[RCPP_PARALLEL_TBB_MIN(len, (int)(sizeof(gr) - 1))] = 0;
 
             for (i = 0; group_list[i].name != NULL; i++)
             {
@@ -855,6 +853,7 @@ static __itt_group_id __itt_get_groups(void)
 
     return res;
 }
+#undef RCPP_PARALLEL_TBB_MIN
 
 static int __itt_lib_version(lib_t lib)
 {

Original file line number	Diff line number	Diff line change
`@@ -806,10 +806,8 @@ static const char* __itt_get_lib_name(void)`
`806`	`806`	`return lib_name;`
`807`	`807`	`}`
`808`	`808`
`809`		`-#ifndef min`
`810`		`-#define min(a,b) (a) < (b) ? (a) : (b)`
`811`		`-#endif /* min */`
`812`		`-`
	`809`	`+/* PATCH: Avoid stomping on 'min()' definition */`
	`810`	`+#define RCPP_PARALLEL_TBB_MIN(a, b) (a) < (b) ? (a) : (b)`
`813`	`811`	`static __itt_group_id __itt_get_groups(void)`
`814`	`812`	`{`
`815`	`813`	`int i;`
`@@ -825,7 +823,7 @@ static __itt_group_id __itt_get_groups(void)`
`825`	`823`	`while ((group_str = __itt_fsplit(group_str, ",; ", &chunk, &len)) != NULL)`
`826`	`824`	`{`
`827`	`825`	`__itt_fstrcpyn(gr, chunk, sizeof(gr) - 1);`
`828`		`- gr[min(len, (int)(sizeof(gr) - 1))] = 0;`
	`826`	`+ gr[RCPP_PARALLEL_TBB_MIN(len, (int)(sizeof(gr) - 1))] = 0;`
`829`	`827`
`830`	`828`	`for (i = 0; group_list[i].name != NULL; i++)`
`831`	`829`	`{`
`@@ -855,6 +853,7 @@ static __itt_group_id __itt_get_groups(void)`
`855`	`853`
`856`	`854`	`return res;`
`857`	`855`	`}`
	`856`	`+#undef RCPP_PARALLEL_TBB_MIN`
`858`	`857`
`859`	`858`	`static int __itt_lib_version(lib_t lib)`
`860`	`859`	`{`