[SCM] lame/master: Fix warning on 64 bit machines on use of size_t. Changes size_t variables to unsigned ints.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Wed Oct 27 19:35:37 UTC 2010
The following commit has been merged in the master branch:
commit 3c10d981dc7a8bae9587790886e1a97c935a7802
Author: Andres Mejia <mcitadel at gmail.com>
Date: Wed Oct 27 15:34:43 2010 -0400
Fix warning on 64 bit machines on use of size_t.
Changes size_t variables to unsigned ints.
diff --git a/debian/patches/07-field-width-fix.patch b/debian/patches/07-field-width-fix.patch
new file mode 100644
index 0000000..8bb96a0
--- /dev/null
+++ b/debian/patches/07-field-width-fix.patch
@@ -0,0 +1,21 @@
+Fix warning on 64 bit machines. Explicitely set variables as unsigned ints.
+==========================================================================
+--- a/frontend/parse.c
++++ b/frontend/parse.c
+@@ -500,11 +500,11 @@
+ const char *b = get_lame_os_bitness();
+ const char *v = get_lame_version();
+ const char *u = get_lame_url();
+- const size_t lenb = strlen(b);
+- const size_t lenv = strlen(v);
+- const size_t lenu = strlen(u);
+- const size_t lw = 80; /* line width of terminal in characters */
+- const size_t sw = 16; /* static width of text */
++ const unsigned int lenb = strlen(b);
++ const unsigned int lenv = strlen(v);
++ const unsigned int lenu = strlen(u);
++ const unsigned int lw = 80; /* line width of terminal in characters */
++ const unsigned int sw = 16; /* static width of text */
+
+ if (lw >= lenb + lenv + lenu + sw || lw < lenu + 2)
+ /* text fits in 80 chars per line, or line even too small for url */
diff --git a/debian/patches/series b/debian/patches/series
index 16b6d03..bdbedbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
04-exec-stac.patch
05-armel-no-finite-math-only.patch
06-sndfile-stdin.patch
+07-field-width-fix.patch
--
lame packaging
More information about the pkg-multimedia-commits
mailing list