Changeset ff381a7 in mainline for uspace/lib/posix/source/stdio/scanf.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/posix/source/stdio/scanf.c (modified) (3 diffs)

uspace/lib/posix/source/stdio/scanf.c

@@ -698 +698 @@
                                                         break;
                                                 case LMOD_j: ;
-                                                        posix_uintmax_t *pj = va_arg(arg, posix_uintmax_t *);
-                                                        *pj = (posix_uintmax_t) ures;
+                                                        uintmax_t *pj = va_arg(arg, uintmax_t *);
+                                                        *pj = (uintmax_t) ures;
                                                         break;
                                                 case LMOD_z: ;
@@ -740 +740 @@
                                                         break;
                                                 case LMOD_j: ;
-                                                        posix_intmax_t *pj = va_arg(arg, posix_intmax_t *);
-                                                        *pj = (posix_intmax_t) sres;
+                                                        intmax_t *pj = va_arg(arg, intmax_t *);
+                                                        *pj = (intmax_t) sres;
                                                         break;
                                                 case LMOD_z: ;
@@ -748 +748 @@
                                                         break;
                                                 case LMOD_t: ;
-                                                        posix_ptrdiff_t *pt = va_arg(arg, posix_ptrdiff_t *);
-                                                        *pt = (posix_ptrdiff_t) sres;
+                                                        ptrdiff_t *pt = va_arg(arg, ptrdiff_t *);
+                                                        *pt = (ptrdiff_t) sres;
                                                         break;
                                                 default: