summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libdecnumber/ChangeLog5
-rw-r--r--libdecnumber/decNumberLocal.h7
2 files changed, 8 insertions, 4 deletions
diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 52b517854a..65d20fcdbd 100644
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-23 Marek Polacek <polacek@redhat.com>
+
+ PR c/59871
+ * decNumberLocal.h (UBFROMUS, UBFROMUI): Remove last argument.
+
2013-10-15 David Malcolm <dmalcolm@redhat.com>
* Makefile.in (PICFLAG): New.
diff --git a/libdecnumber/decNumberLocal.h b/libdecnumber/decNumberLocal.h
index c8dbafc3f4..b0e404d7d1 100644
--- a/libdecnumber/decNumberLocal.h
+++ b/libdecnumber/decNumberLocal.h
@@ -153,10 +153,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define UBTOUI(b) (memcpy((void *)&uiwork, b, 4), uiwork)
/* Store a uInt, etc., into bytes starting at a char* or uByte*. */
- /* Returns i, evaluated, for convenience; has to use uiwork because */
- /* i may be an expression. */
- #define UBFROMUS(b, i) (uswork=(i), memcpy(b, (void *)&uswork, 2), uswork)
- #define UBFROMUI(b, i) (uiwork=(i), memcpy(b, (void *)&uiwork, 4), uiwork)
+ /* Has to use uiwork because i may be an expression. */
+ #define UBFROMUS(b, i) (uswork=(i), memcpy(b, (void *)&uswork, 2))
+ #define UBFROMUI(b, i) (uiwork=(i), memcpy(b, (void *)&uiwork, 4))
/* X10 and X100 -- multiply integer i by 10 or 100 */
/* [shifts are usually faster than multiply; could be conditional] */