diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h
index 1c6645e..9965949 100644
--- a/src/cairo-compiler-private.h
+++ b/src/cairo-compiler-private.h
@@ -111,8 +111,11 @@ CAIRO_BEGIN_DECLS
 #define __attribute__(x)
 #endif
 
-#ifdef _MSC_VER
+#ifdef __WIN32__
 #define snprintf _snprintf
+#endif
+
+#ifdef _MSC_VER
 #undef inline
 #define inline __inline
 #endif
diff --git a/src/cairo-output-stream.c b/src/cairo-output-stream.c
index 22245f7..a9bc6ef 100644
--- a/src/cairo-output-stream.c
+++ b/src/cairo-output-stream.c
@@ -36,16 +36,13 @@
 #include "cairoint.h"
 
 #include "cairo-output-stream-private.h"
+#include "cairo-compiler-private.h"
 
 #include <stdio.h>
 #include <locale.h>
 #include <ctype.h>
 #include <errno.h>
 
-#ifdef _MSC_VER
-#define snprintf _snprintf
-#endif /* _MSC_VER */
-
 
 void
 _cairo_output_stream_init (cairo_output_stream_t            *stream,