From: hanwen <hanwen>
Date: Tue, 14 Feb 2006 14:16:57 +0000 (+0000)
Subject: (VPOS): use 64 bit-proof version.
X-Git-Tag: release/2.7.38^2~145
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d9b22f6d31518a6073c6730e0b309e866e03ea5b;p=lilypond.git

(VPOS): use 64 bit-proof version.
---

diff --git a/ChangeLog b/ChangeLog
index ed9626ab43..c426722cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-02-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* flower/include/std-vector.hh (VPOS): use 64 bit-proof version.
+
+	* VERSION: release 2.7.34
+
 	* lily/relocate.cc (framework_relocation): show canary if
 	GHOSTSCRIPT_VERSION undefined.
 
diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 69fecfdc31..bb60308d5d 100644
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -47,7 +47,7 @@ int default_compare (T *const &a, T *const &b)
 #ifndef VSIZE
 #define VSIZE
 typedef size_t vsize;
-#define VPOS UINT_MAX
+#define VPOS ((vsize) -1)
 #endif
 
 #if HAVE_STL_DATA_METHOD
diff --git a/lily/font-config.cc b/lily/font-config.cc
index b404354e4d..393feb2b6c 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -50,7 +50,9 @@ init_fontconfig ()
       else if (be_verbose_global)
 	message (_f ("adding font directory: %s", dir.c_str ()));
     }
-
+  
+  if (be_verbose_global)
+    progress_indication ("Building font database.\n");
   FcConfigBuildFonts (font_config_global);
   FcConfigSetCurrent (font_config_global);
   if (be_verbose_global)