diff --git a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_spec.h b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_spec.h
index 86a7915565..f613c4eeeb 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_spec.h
+++ b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_spec.h
@@ -72,9 +72,13 @@
 /*
  * Compile time assert check.
  */
-#ifdef static_assert
+#if __GNUC__ > 3
+#ifdef __cplusplus
 #define nvme_static_assert(cond, msg)	static_assert(cond, msg)
 #else
+#define nvme_static_assert(cond, msg)	_Static_assert(cond, msg)
+#endif
+#else
 #define nvme_static_assert(cond, msg)
 #endif