Merge pull request grpc#21580 from yashykt/timeprecisebug

Replace or with ||
muxi · Jan 6, 2020 · 1388c7a · 1388c7a
2 parents ca60aac + 324d2e6
commit 1388c7a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/lib/gpr/time_precise.cc b/src/core/lib/gpr/time_precise.cc
@@ -31,7 +31,7 @@
 
 #include "src/core/lib/gpr/time_precise.h"
 
-#if GPR_CYCLE_COUNTER_RDTSC_32 or GPR_CYCLE_COUNTER_RDTSC_64
+#if GPR_CYCLE_COUNTER_RDTSC_32 || GPR_CYCLE_COUNTER_RDTSC_64
 #if GPR_LINUX
 static bool read_freq_from_kernel(double* freq) {
   // Google production kernel export the frequency for us in kHz.