diff --git a/include/socks/compiler.h b/include/socks/compiler.h
index f0d3308..4145e8f 100644
--- a/include/socks/compiler.h
+++ b/include/socks/compiler.h
@@ -1,9 +1,6 @@
 #ifndef SOCKS_COMPILER_H_
 #define SOCKS_COMPILER_H_
 
-#define READ_ONCE(t, p) (*((const volatile t *)&(p)))
-#define WRITE_ONCE(t, p, v) *(volatile t *)&(p) = (v)
-
 #ifdef __cplusplus
 template <typename T>
 T read_once(const volatile T *ptr)
@@ -16,6 +13,11 @@ void write_once(volatile T *ptr, T value)
 {
 	*ptr = value;
 }
+#else
+
+#define READ_ONCE(p) (*((const volatile typeof(p) *)&(p)))
+#define WRITE_ONCE(p, v) *(volatile typeof(p) *)&(p) = (v)
+
 #endif
 
 #undef __used