diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-05-19 08:31:25 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-05-19 08:31:25 +0000 |
commit | 324f853c7ef10cf23765b740f3a2f5a6164ad426 (patch) | |
tree | 45d5a9d291e0caf71bb3b1470bf00c11e8a07457 /Build/source/texk/web2c | |
parent | 2df1a0de2950ebd5697b994c1bbf7c655ac271c9 (diff) |
Avoid compiler warnings on 64Bit systems
git-svn-id: svn://tug.org/texlive/trunk@18349 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/alephdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/alephdir/aleph.c | 3 | ||||
-rw-r--r-- | Build/source/texk/web2c/cpascal.h | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/texmfmp.h | 4 |
5 files changed, 20 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 3cf0383b332..fccd99114c0 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * cpascal.h (BIBXRETALLOCNOSET, BIBXRETALLOCSTRING): Cast size_t + to long for printing to avoid warnings on 64Bit systems. + * texmfmp.h (undumpcheckedthings, undumpuppercheckthings): + Cast high limit to unsigned long for printing. + 2010-05-18 Karl Berry <karl@tug.org> * configure.ac (web2_version): use /pretest ident. diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index 520a31befb1..3f7ce719757 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,8 @@ +2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * aleph.c (new_input_line): Cast integer to long for printing + to avoid warning on 64Bit systems. + 2010-05-18 Peter Breitenlohner <peb@mppmu.mpg.de> * eobase.ch: Adapt to ../etexdir/etex.ch: diff --git a/Build/source/texk/web2c/alephdir/aleph.c b/Build/source/texk/web2c/alephdir/aleph.c index 6a19be3884c..315f9ad4cd4 100644 --- a/Build/source/texk/web2c/alephdir/aleph.c +++ b/Build/source/texk/web2c/alephdir/aleph.c @@ -179,7 +179,8 @@ new_input_line (FILE *f, halfword themode) if (i != EOF && (((themode!=2) && (i != '\n')) || ((themode==2) && (i != 0x25)))) { (void) fprintf (stderr, - "! Unable to read an entire line---ocp_buf_size=%ld.\n",ocpbufsize); + "! Unable to read an entire line---ocp_buf_size=%ld.\n", + (long) ocpbufsize); (void) fprintf (stderr, "Please increase ocp_buf_size in texmf.cnf.\n"); uexit (1); } diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h index c98a1b2c529..a4b5976d295 100644 --- a/Build/source/texk/web2c/cpascal.h +++ b/Build/source/texk/web2c/cpascal.h @@ -167,8 +167,8 @@ typedef unsigned char *pointertobyte; Actually allocate one more than requests, so we can index the last entry, as Pascal wants to do. */ #define BIBXRETALLOCNOSET(array_name, array_var, type, size_var, new_size) \ - fprintf (logfile, "Reallocated %s (elt_size=%d) to %ld items from %ld.\n", \ - array_name, (int) sizeof (type), new_size, size_var); \ + fprintf (logfile, "Reallocated %s (elt_size=%ld) to %ld items from %ld.\n", \ + array_name, (long) sizeof (type), (long) new_size, (long) size_var); \ XRETALLOC (array_var, new_size + 1, type) /* Same as above, but also increase SIZE_VAR when no more arrays with the same size parameter will be resized. */ @@ -178,8 +178,8 @@ typedef unsigned char *pointertobyte; } while (0) /* Same as above, but for the pseudo-TYPE ASCII_code[LENGTH+1]. */ #define BIBXRETALLOCSTRING(array_name, array_var, length, size_var, new_size) \ - fprintf (logfile, "Reallocated %s (elt_size=%d) to %ld items from %ld.\n", \ - array_name, (int) (length + 1), new_size, size_var); \ + fprintf (logfile, "Reallocated %s (elt_size=%ld) to %ld items from %ld.\n", \ + array_name, (long) (length + 1), (long) new_size, (long) size_var); \ XRETALLOC (array_var, (new_size) * (length + 1), ASCIIcode) /* Need precisely int for getopt, etc. */ diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h index 0dfdb8f42ad..77e7a756f64 100644 --- a/Build/source/texk/web2c/texmfmp.h +++ b/Build/source/texk/web2c/texmfmp.h @@ -285,7 +285,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/); if ((&(base))[i] < (low) || (&(base))[i] > (high)) { \ FATAL5 ("Item %u (=%ld) of .fmt array at %lx <%ld or >%ld", \ i, (unsigned long) (&(base))[i], (unsigned long) &(base),\ - (unsigned long) low, (integer) high); \ + (unsigned long) low, (unsigned long) high); \ } \ } \ } while (0) @@ -301,7 +301,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/); if ((&(base))[i] > (high)) { \ FATAL4 ("Item %u (=%ld) of .fmt array at %lx >%ld", \ i, (unsigned long) (&(base))[i], (unsigned long) &(base),\ - (integer) high); \ + (unsigned long) high); \ } \ } \ } while (0) |