From f731d68fefe35ea8630c472e453ad640e5043ede Mon Sep 17 00:00:00 2001 From: vjpai Date: Wed, 25 Mar 2015 14:55:25 -0700 Subject: [PATCH] Avoid a problem when clang pretends to be GNUC --- include/grpc++/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/grpc++/config.h b/include/grpc++/config.h index e10f00fb63c..8ef5d71bfac 100644 --- a/include/grpc++/config.h +++ b/include/grpc++/config.h @@ -65,11 +65,13 @@ ::google::protobuf::io::ZeroCopyInputStream #endif +#ifndef __clang__ #ifdef __GNUC__ #if (__GNUC__ * 100 + __GNUC_MINOR__ < 406) #define GRPC_NO_NULLPTR #endif #endif +#endif #ifdef GRPC_NO_NULLPTR #include