* scm/framework-ps.scm (write-preamble): extract CFF from OTF

[lilypond.git] / flower / file-name.cc

diff --git a/flower/file-name.cc b/flower/file-name.cc
index c26562664a7f110186da76bc3ea75afd40961cca..12a63ba694f8c65e52ca463f04ddb6d6f630029d 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -1,18 +1,20 @@
 /*
   file-name.cc - implement File_name
-   
+
   source file of the Flower Library
-  
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "config.h"
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
+#include "file-name.hh"
+
+#include <cstdio>
+#include <cerrno>
 
-#if HAVE_SYS_STAT_H 
+#include "config.hh"
+
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 
@@ -20,8 +22,6 @@
 #include <sys/cygwin.h>
 #endif
 
-#include "file-name.hh"
-
 /* We don't have multiple roots, set this to '\0'? */
 #ifndef ROOTSEP
 #define ROOTSEP ':'
@@ -63,7 +63,7 @@ File_name::to_string () const
   return s;
 }
 
-char const*
+char const *
 File_name::to_str0 () const
 {
   return to_string ().to_str0 ();