Index: include/parrot/misc.h
===================================================================
--- include/parrot/misc.h	(revision 26507)
+++ include/parrot/misc.h	(working copy)
@@ -24,10 +24,22 @@
 
 #define FLOAT_IS_ZERO(f) ((f) == 0.0)
 
-#ifndef PARROT_HAS_C99_SNPRINTF
-#  define snprintf Parrot_secret_snprintf
+/* Per Dan's orders, we will not use sprintf if snprintf isn't
+ * around for us.
+ */
+/* Try to use the MSC _snprintf function if available
+ * If not, and if the system doesnt have snprintf installed, 
+ * use Parrot_secret_snprintf instead.
+ */
+#ifdef _MSC_VER
+#  define snprintf _snprintf
+#else
+#  ifndef PARROT_HAS_C99_SNPRINTF
+#    define snprintf Parrot_secret_snprintf
+#  endif
 #endif
 
+
 typedef int (*reg_move_func)(PARROT_INTERP, unsigned char d, unsigned char s, void *);
 
 /* HEADERIZER BEGIN: src/utils.c */
Index: src/spf_render.c
===================================================================
--- src/spf_render.c	(revision 26507)
+++ src/spf_render.c	(working copy)
@@ -91,14 +91,6 @@
 
 /* HEADERIZER END: static */
 
-
-/* Per Dan's orders, we will not use sprintf if snprintf isn't
- * around for us.
- */
-#ifdef _MSC_VER
-#  define snprintf _snprintf
-#endif
-
 /*
 
 =item C<static STRING * handle_flags>