diff --git a/include/rtw_byteorder.h b/include/rtw_byteorder.h
index 8e6bb7a..5177310 100644
--- a/include/rtw_byteorder.h
+++ b/include/rtw_byteorder.h
@@ -20,6 +20,18 @@
 	#error "Shall be CONFIG_LITTLE_ENDIAN or CONFIG_BIG_ENDIAN, but not both!\n"
 #endif
 
+#if !((defined CONFIG_LITTLE_ENDIAN) || (defined CONFIG_BIG_ENDIAN))
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define CONFIG_LITTLE_ENDIAN
+//#warning "Auto-detected little-endian system...hope it is correct!"
+#else
+#if __BYTE_ORDER == __BIG_ENDIAN
+//#warning "Auto-detected big-endian system...hope it is correct!"
+#define CONFIG_BIG_ENDIAN
+#endif
+#endif
+#endif
+
 #if defined(CONFIG_LITTLE_ENDIAN)
 	#ifndef CONFIG_PLATFORM_MSTAR389
 		#include <byteorder/little_endian.h>