--- logger.c	24 Oct 2004 06:12:21 -0000	1.46
+++ logger.c	28 Oct 2004 11:21:22 -0000
@@ -648,7 +648,7 @@
 	} /* else
 		fprintf(stdout, stuff + opos); */
 
-	ast_log(LOG_VERBOSE, stuff);
+	ast_log(LOG_VERBOSE, "%s", stuff);
 
 	if (fmt[strlen(fmt)-1] != '\n') 
 		replacelast = 1;
--- include/asterisk/logger.h	12 Feb 2004 22:11:02 -0000	1.9
+++ include/asterisk/logger.h	28 Oct 2004 11:21:22 -0000
@@ -59,6 +59,15 @@
 extern int ast_verbose_dmesg(void (*verboser)(const char *string, int opos, int replacelast, int complete));
 extern void ast_console_puts(const char *string);
 
+#endif /* _LOGGER_H */
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+
+/* These macros lie outside of the header, as we want to define them EVERY time we're included */
+
 #define _A_ __FILE__, __LINE__, __PRETTY_FUNCTION__
 
 #ifdef LOG_DEBUG
@@ -97,9 +106,3 @@
 #define __LOG_VERBOSE  5
 #define LOG_VERBOSE    __LOG_VERBOSE, _A_
 
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-
-#endif