X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ffreetype.cc;h=73d2271448e64858d7f7d19f72a62fb2bb6c450a;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c48ef614c6dc0cc56049f4e6a59cf8d622b15a4e;hpb=01df8ad908c92687d0c352e5ad5f067e52809423;p=lilypond.git

diff --git a/lily/freetype.cc b/lily/freetype.cc
index c48ef614c6..73d2271448 100644
--- a/lily/freetype.cc
+++ b/lily/freetype.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   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,8 +20,8 @@
 #include "freetype.hh"
 #include "warn.hh"
 
-#include <freetype/ftoutln.h>
-#include <freetype/ftbbox.h>
+#include FT_OUTLINE_H
+#include FT_BBOX_H
 
 FT_Library freetype2_library;
 
@@ -112,7 +112,7 @@ ly_FT_get_glyph_outline (FT_Face const &face, size_t signed_idx)
   SCM out = SCM_EOL;
   Offset lastpos;
   Offset firstpos;
-  vsize j = 0;
+  int j = 0;
   while (j < outline->n_points)
     {
       if (j == 0)