--- lib_replace_snprintf.c	2011-05-30 09:52:59.815249373 -0700
+++ snprintf.c	2011-05-30 13:13:37.299925872 -0700
@@ -126,9 +126,6 @@
  void dummy_snprintf(void) {} 
 #endif /* HAVE_SNPRINTF, etc */
 
-/* yes this really must be a ||. Don't muck with this (tridge) */
-#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
-
 #ifdef HAVE_LONG_DOUBLE
 #define LDOUBLE long double
 #else
@@ -151,6 +148,10 @@
 #define VA_COPY(dest, src) (dest) = (src)
 #endif
 #endif
+#endif 
+
+/* yes this really must be a ||. Don't muck with this (tridge) */
+#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 
 /*
  * dopr(): poor man's version of doprintf
@@ -1254,8 +1255,6 @@ static int add_cnk_list_entry(struct pr_
 }
 #endif
 
-#endif 
-
 #ifndef HAVE_VASPRINTF
  int vasprintf(char **ptr, const char *format, va_list ap)
 {