X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffreetype-error.cc;h=8846b4d0419b39fff1849a2a9f9b4900287eedf0;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=1f4dc468181fce0063a4a883fe511cd4696ae005;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
index 1f4dc46818..8846b4d041 100644
--- a/lily/freetype-error.cc
+++ b/lily/freetype-error.cc
@@ -1,8 +1,8 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2010 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+  Copyright (C) 2007--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
+
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,34 +20,33 @@
 
 #include "freetype.hh"
 
-#undef __FTERRORS_H__                                           
-#define FT_ERRORDEF(e, v, s)  { e, s },                       
-#define FT_ERROR_START_LIST     {                               
-#define FT_ERROR_END_LIST       { 0, 0 } };                     
-                                                                         
+#undef __FTERRORS_H__
+#define FT_ERRORDEF(e, v, s)  { e, s },
+#define FT_ERROR_START_LIST     {
+#define FT_ERROR_END_LIST       { 0, 0 } };
+
 const struct Freetype_error_message
-{                                                               
-  int          err_code;                                        
-  const char*  err_msg;
-} ft_errors[] =                                                 
-                                                                         
-#include <freetype/fterrors.h>
+{
+  FT_Error err_code;
+  const char *err_msg;
+} ft_errors[] =
 
-  ;
+#include FT_ERRORS_H
 
+  ;
 
 #include <string>
 
 string
-freetype_error_string (int code)
+freetype_error_string (FT_Error code)
 {
   for (Freetype_error_message const *p = ft_errors;
-       p->err_msg; p ++)
+       p->err_msg; p++)
     {
       if (p->err_code == code)
-	return p->err_msg;
+        return p->err_msg;
     }
 
-  return "<unknown error>"; 
+  return "<unknown error>";
 }
-  
+