Merge changes from CUPS 1.6svn-r9968.

[thirdparty/cups.git] / cups / debug-private.h

diff --git a/cups/debug-private.h b/cups/debug-private.h
index c739fa68a0fd7797708864a91b505d3212ac7b7b..e40e58386598cd87970c0d6d36d2bf9f55bd21d0 100644 (file)
--- a/cups/debug-private.h
+++ b/cups/debug-private.h
@@ -18,6 +18,14 @@
 #ifndef _CUPS_DEBUG_PRIVATE_H_
 #  define _CUPS_DEBUG_PRIVATE_H_
 
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <cups/versioning.h>
+
+
 /*
  * C++ magic...
  */
@@ -88,10 +96,7 @@ extern "C" {
 extern int     _cups_debug_fd;
 extern int     _cups_debug_level;
 extern void    DLLExport _cups_debug_printf(const char *format, ...)
-#ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 1, 2)))
-#endif /* __GNUC__ */
-;
+               __attribute__ ((__format__ (__printf__, 1, 2)));
 extern void    DLLExport _cups_debug_puts(const char *s);
 extern void    DLLExport _cups_debug_set(const char *logfile,
                                          const char *level, const char *filter,