diff --git a/intel/intel_bufmgr_fake.c b/intel/intel_bufmgr_fake.c
index 54b3cb80..9914952f 100644
--- a/intel/intel_bufmgr_fake.c
+++ b/intel/intel_bufmgr_fake.c
@@ -51,6 +51,11 @@
 #include "mm.h"
 #include "libdrm_lists.h"
 
+/* Support gcc's __FUNCTION__ for people using other compilers */
+#if !defined(__GNUC__) && !defined(__FUNCTION__)
+# define __FUNCTION__ __func__ /* C99 */
+#endif
+
 #define DBG(...) do {					\
 	if (bufmgr_fake->bufmgr.debug)			\
 		drmMsg(__VA_ARGS__);			\
diff --git a/tests/drmstat.c b/tests/drmstat.c
index e2e75234..345b8d2c 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -46,6 +46,11 @@
 #endif
 #include "xf86drm.h"
 
+/* Support gcc's __FUNCTION__ for people using other compilers */
+#if !defined(__GNUC__) && !defined(__FUNCTION__)
+# define __FUNCTION__ __func__ /* C99 */
+#endif
+
 int sigio_fd;
 
 static double usec(struct timeval *end, struct timeval *start)