Mercurial > octave

changeset 25685:f8ef00a58768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Jul 2018 16:15:30 -0400
parents 54e79a3785d7 (current diff) a5263875ffdc (diff)
children af0b81f2ffe6
files
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/wrappers/fpucw-wrappers.c	Thu Jul 26 15:32:52 2018 -0400
+++ b/liboctave/wrappers/fpucw-wrappers.c	Thu Jul 26 16:15:30 2018 -0400
@@ -54,12 +54,13 @@
     SET_FPUCW (_FPU_DEFAULT);
 }
 
-// OLDCW is the name used by the fpucw.h macros.
+// OLDCW is the name used by the fpucw.h macros and gnulib doesn't give
+// us a choice.  We are also assuming that fpucw_t is unsigned int.
 
 unsigned int
 octave_begin_long_double_rounding (void)
 {
-  fpucw_t oldcw = 0;
+  DECL_LONG_DOUBLE_ROUNDING
 
   BEGIN_LONG_DOUBLE_ROUNDING ();
 
@@ -70,4 +71,7 @@
 octave_end_long_double_rounding (unsigned int oldcw)
 {
   END_LONG_DOUBLE_ROUNDING ();
+
+  // It might be unused.
+  octave_unused_parameter (oldcw);
 }
--- a/liboctave/wrappers/signal-wrappers.c	Thu Jul 26 15:32:52 2018 -0400
+++ b/liboctave/wrappers/signal-wrappers.c	Thu Jul 26 16:15:30 2018 -0400
@@ -733,13 +733,14 @@
       if (sigismember (sigset, sig))
         {
           cnt++;
-          fprintf (of, "%ld: %s%d (%s)\n", pthread_self (), prefix, sig,
-                   strsignal (sig));
+          fprintf (of, "%ld: %s%d (%s)\n", (long int) pthread_self (),
+                   prefix, sig, strsignal (sig));
         }
     }
 
   if (cnt == 0)
-    fprintf (of, "%ld: %s<empty signal set>\n", pthread_self (), prefix);
+    fprintf (of, "%ld: %s<empty signal set>\n", (long int) pthread_self (),
+             prefix);
 }
 
 static int