build fixes: avoid C99isms (declaration after statement), from Vladimir

git-svn-id: svn://tug.org/texlive/trunk@13098 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 35 insertions, 2 deletions

diff --git a/Build/source/README.config b/Build/source/README.config
index dd2485d6863..8411f138304 100644
--- a/Build/source/README.config
+++ b/Build/source/README.config
@@ -15,6 +15,11 @@ exhaustive list of all global options and a few important package specific
 ones or run, e.g., 'texk/lcdf-typetools/configure --help' to also see
 lcdf-typetools specific options not shown at the top-level.
 
+Note, however, that the ./Build script invokes the top-level configure with
+a few additional options.  Any defaults discussed below are those for the
+configure script, invoking configure from ./Build yields different results. 
+Options explicitly specified on the command will never be modified.
+
 1. Global configure options
 ===========================
 
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL
index d974b842c8b..fba4c767ca7 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/dvipdfmx/ChangeLog.TL
@@ -1,6 +1,13 @@
 ChangeLog.TL: Changes for dvipdfmx (teTeX / TeX Live)
 =====================================================
 
+2009-05-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdfdoc.c (pdf_doc_get_page): Avoid C99isms
+	(variable declaration not at the beginning of a block).
+
+	From  Vladimir Volovich <vvv@vsu.ru>
+
 2009-03-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 	* src/cff.c, src/dpxutil.c, src/mem.c, src/pdfencoding.c,
 	src/pdfencrypt.c: Must include Kpathsea headers (via `system.h')
diff --git a/Build/source/texk/dvipdfmx/src/pdfdoc.c b/Build/source/texk/dvipdfmx/src/pdfdoc.c
index 38f33fb5a43..6b226ed08d6 100644
--- a/Build/source/texk/dvipdfmx/src/pdfdoc.c
+++ b/Build/source/texk/dvipdfmx/src/pdfdoc.c
@@ -965,12 +965,13 @@ pdf_doc_get_page (pdf_obj *trailer, long *page_p, long *count_p,
    */
   {
     pdf_obj *tmp = pdf_deref_obj(pdf_lookup_dict(page_tree, "Count"));
+    long count;
     if (!PDF_OBJ_NUMBERTYPE(tmp)) {
       if (tmp)
 	pdf_release_obj(tmp);
       goto error;
     }
-    long count = pdf_number_value(tmp);
+    count = pdf_number_value(tmp);
     pdf_release_obj(tmp);
     page_idx = page_no + (page_no >= 0 ? -1 : count);
     if (page_idx < 0 || page_idx >= count) {
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index fcbe0dfcd4d..65a362523b4 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* absolute.c, hash.c: Avoid C99isms (variable declaration not at
+        the beginning of a block).
+
+	From  Vladimir Volovich <vvv@vsu.ru>
+
 2009-05-12  Karl Berry  <karl@tug.org>
 
 	* tex-file.c (kpathsea_init_format): set suffix_search_only
diff --git a/Build/source/texk/kpathsea/absolute.c b/Build/source/texk/kpathsea/absolute.c
index 6012c398b5b..1a743c84cd0 100644
--- a/Build/source/texk/kpathsea/absolute.c
+++ b/Build/source/texk/kpathsea/absolute.c
@@ -27,7 +27,7 @@
 boolean
 kpathsea_absolute_p (kpathsea kpse, const_string filename,  boolean relative_ok)
 {
-    (void)kpse; /* currenty not used */
+/*    (void)kpse; */ /* currenty not used */
 #ifdef VMS
 #include <string.h>
   return strcspn (filename, "]>:") != strlen (filename);
diff --git a/Build/source/texk/kpathsea/hash.c b/Build/source/texk/kpathsea/hash.c
index 02bcb865d97..f67b71bb230 100644
--- a/Build/source/texk/kpathsea/hash.c
+++ b/Build/source/texk/kpathsea/hash.c
@@ -182,6 +182,7 @@ hash_lookup (hash_table_type table,  const_string key)
 
 #ifdef KPSE_DEBUG
 #if defined (KPSE_COMPAT_API)
+  {
   kpathsea kpse = kpse_def;
   if (KPATHSEA_DEBUG_P (KPSE_DEBUG_HASH))
     {
@@ -203,6 +204,7 @@ hash_lookup (hash_table_type table,  const_string key)
         }
       fflush (stderr);
     }
+  }
 #endif
 #endif
 
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 242f78e8f96..11e99f7478c 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* coerce.h: Modify #define of synch_p_with_c for luaTeX.
+
+	From  Vladimir Volovich <vvv@vsu.ru>
+
 2009-04-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* convert: use output redirection ('>>') to append the contents
diff --git a/Build/source/texk/web2c/web2c/coerce.h b/Build/source/texk/web2c/web2c/coerce.h
index ddb0203eac3..047acdd3049 100644
--- a/Build/source/texk/web2c/web2c/coerce.h
+++ b/Build/source/texk/web2c/web2c/coerce.h
@@ -22,6 +22,11 @@
 #define	eq_destroy(x)	zeq_destroy(x)
 #endif
 
+#ifdef  synch_p_with_c
+#undef  synch_p_with_c
+#define synch_p_with_c(x) zsynch_p_with_c(x)
+#endif
+
 #else /* luaTeX */
 
 #ifdef	printword