Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / flower / include / file-cookie.hh

diff --git a/flower/include/file-cookie.hh b/flower/include/file-cookie.hh
index 571e4a74dbba4bba010f787e3ea65e47e52d81bd..ab2558fd14730d34adb1508d62fe51f5d66d116f 100644 (file)
--- a/flower/include/file-cookie.hh
+++ b/flower/include/file-cookie.hh
@@ -2,14 +2,16 @@
 extern "C" {
 #endif
 
-
-#include <stdio.h>
 #include <unistd.h>
 
+#include <cstdio>
+using namespace std;
+
+
 #if (! defined (__off64_t) && ! defined (__off64_t_defined)) || ! defined (__cplusplus)
 #define off64_t unsigned long long
 #endif
- 
+
   typedef struct
   {
     ssize_t (*read) (void *, char *, size_t);
@@ -18,12 +20,12 @@ extern "C" {
     int (*close) (void *);
   } lily_cookie_io_functions_t;
 
-
   void *lily_fopencookie (void *cookie, char const *modes,
                          lily_cookie_io_functions_t io_funcs);
 
   int lily_cookie_fclose (void *);
-  int lily_cookie_fprintf (void *file, char const *format, ...);
+  int lily_cookie_fprintf (void *file, char const *format, ...)
+    __attribute__ ((format (printf, 2, 3)));
   int lily_cookie_putc (int c, void *file);
 
 #ifdef __cplusplus