--- smartmontools-6.4/regex/regex.h.cplus 2012-12-13 18:23:06.000000000 +0100 +++ smartmontools-6.4/regex/regex.h 2016-02-19 22:42:53.390013000 +0100 @@ -536,7 +536,7 @@ #endif /* gcc 3.1 and up support the [restrict] syntax. */ #ifndef __restrict_arr -# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && !defined(__WIN32__) +# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) && !defined(__WIN32__) && !defined(__cplusplus) # define __restrict_arr __restrict # else # define __restrict_arr