diff --git a/src/server/local-to-global.c b/src/server/local-to-global.c
index 9b94f22027a3662bb4bdf77ec7fce5aa7e3806f7..83c5f81aa455926cc610de4e7e67afb6976ce5af 100644
--- a/src/server/local-to-global.c
+++ b/src/server/local-to-global.c
@@ -330,13 +330,16 @@ l2g_copy(Local_to_global *from, Local_to_global *to)
  * Append the pair LNO-TNO.  LNO has to be bigger than the last local 
  * number in the structure (this is not tested FIXME?).
  */
+
+typedef Local_text_no Local_text_no_iter;
+
 void
 l2g_append(Local_to_global *l2g, 
 	   Local_text_no    lno,
 	   Text_no          tno)
 {
     L2g_block_info  * binfo;
-    int               i;
+    Local_text_no_iter ix;
 
     /* Don't add anything if tno == 0. */
     if (tno == 0)
@@ -391,8 +394,8 @@ l2g_append(Local_to_global *l2g,
     if (binfo->key_block == NULL) {
 	/* A dense block. */
 
-	for (i = binfo->first_free; i < lno - binfo->start; ++i)
-	    binfo->value_block[i] = 0;
+	for (ix = binfo->first_free; ix < lno - binfo->start; ++ix)
+	    binfo->value_block[ix] = 0;
 	binfo->value_block[lno - binfo->start] = tno;
 	binfo->first_free = lno - binfo->start + 1;