From: Jan Nieuwenhuizen <janneke@gnu.org> Date: Thu, 17 Jun 2004 13:39:49 +0000 (+0000) Subject: * lily/lily-guile.cc: X-Git-Tag: release/2.2.3~1^2~16 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=df41cc6f62b2e678f1b5839f0c1af142b218de13;p=lilypond.git * lily/lily-guile.cc: * lily/pangofc-afm-decoder.cc: * lily/include/pangofc-afm-decoder.hh: Use #if HAVE_* iso #ifdef. Fixes build without Pango CVS. --- diff --git a/ChangeLog b/ChangeLog index d88d9062a4..1f69d4963e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-06-17 Jan Nieuwenhuizen <janneke@gnu.org> + * lily/lily-guile.cc: + * lily/pangofc-afm-decoder.cc: + * lily/include/pangofc-afm-decoder.hh: Use #if HAVE_* iso #ifdef. + Fixes build without Pango CVS. + * Documentation/topdocs/NEWS.texi (Top): Mention GNOME backend for developers. diff --git a/lily/include/pangofc-afm-decoder.hh b/lily/include/pangofc-afm-decoder.hh index b9fb6162f3..cde2830b0b 100644 --- a/lily/include/pangofc-afm-decoder.hh +++ b/lily/include/pangofc-afm-decoder.hh @@ -27,7 +27,7 @@ #define __PANGOFC_AFM_DECODER_H__ #include "config.h" -#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC +#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC /* Note: in C and with explicit header for use outside of LilyPond. */ diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 5c9d9b6b21..47be547d79 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -781,7 +781,7 @@ LY_DEFINE (ly_protects, "ly:protects", #endif -#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC +#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC #include "pangofc-afm-decoder.hh" diff --git a/lily/pangofc-afm-decoder.cc b/lily/pangofc-afm-decoder.cc index 184418bfbf..92545bde61 100644 --- a/lily/pangofc-afm-decoder.cc +++ b/lily/pangofc-afm-decoder.cc @@ -24,7 +24,7 @@ */ #include "config.h" -#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC +#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC /* Need to access to PangoFcFont.full_pattern. */ #define PANGO_ENABLE_BACKEND