diff --git a/Makefile b/Makefile
index 2fd881843..c7524747c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 export CC  = gcc
-export CXX = g++
+export CXX = clang++
 export LDFLAGS= -pthread -lm 
 
 export CFLAGS = -Wall -O3 -msse2  -Wno-unknown-pragmas -fPIC -pedantic -ansi
diff --git a/src/utils/utils.h b/src/utils/utils.h
index 1214be861..49bd36819 100644
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -10,8 +10,10 @@
 #include <cstdarg>
 #include <string>
 #include <cstdlib>
-#ifdef _MSC_VER
+#if !defined(__GNUC__)
 #define fopen64 fopen
+#endif
+#ifdef _MSC_VER
 // NOTE: sprintf_s is not equivalent to snprintf, 
 // they are equivalent when success, which is sufficient for our case
 #define snprintf sprintf_s