Mercurial > octave

changeset 26162:ef1ef6364a6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Silence compiler warnings about incorrect format specifiers cross-compiling (bug #55046). * sysdep.cc: Use format specifier %ld for long int. * audioread.cc: Use format specifier macro PRId64 for int64_t.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 03 Dec 2018 19:15:06 +0100
parents a61d3d3463e0
children d478d5d1c8e9
files libinterp/corefcn/sysdep.cc libinterp/dldfcn/audioread.cc
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/sysdep.cc	Mon Dec 03 08:54:07 2018 -0800
+++ b/libinterp/corefcn/sysdep.cc	Mon Dec 03 19:15:06 2018 +0100
@@ -933,7 +933,7 @@
 
       LONG retval = get_regkey_names (h_rootkey, subkey_name, fields);
       if (retval != ERROR_SUCCESS)
-        error ("winqueryreg: error %d reading names from registry", retval);
+        error ("winqueryreg: error %ld reading names from registry", retval);
 
       Cell fieldnames (dim_vector (1, fields.size ()));
       size_t i;
@@ -953,7 +953,7 @@
                value_name.c_str (), rootkey_name.c_str (),
                subkey_name.c_str ());
       if (retval != ERROR_SUCCESS)
-        error ("winqueryreg: error %d reading the specified key", retval);
+        error ("winqueryreg: error %ld reading the specified key", retval);
 
       return ovl (key_val);
     }
--- a/libinterp/dldfcn/audioread.cc	Mon Dec 03 08:54:07 2018 -0800
+++ b/libinterp/dldfcn/audioread.cc	Mon Dec 03 19:15:06 2018 +0100
@@ -457,8 +457,8 @@
       sf_count_t items_written = sf_write_float (file, data+offset, chunk_size);
 
       if (items_written != chunk_size)
-        error ("audiowrite: write failed, wrote %ld of %ld items\n",
-               items_written, chunk_size);
+        error ("audiowrite: write failed, wrote %" PRId64 " of %" PRId64
+               " items\n", items_written, chunk_size);
 
       total_items_written += items_written;
       offset += chunk_size;