(VPOS): use 64 bit-proof version.

diff --git a/ChangeLog b/ChangeLog
index ed9626ab43375f3707346a4795fbe9035203a48a..c426722cd6edbe898f00cf8b1474a88d9ee4b216 100644 (file)
--- 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 69fecfdc3143d365f4f40da1361b8f44bbd3deb7..bb60308d5d7c41a539f5764450e24a7c6802ab59 100644 (file)
--- 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 b404354e4db8d6e2988573ac3aebce9c3c1dbd25..393feb2b6c93c9a23e9c961199c4fb404af1837a 100644 (file)
--- 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)