Changeset ff381a7 in mainline for uspace/lib/c/generic/private/stdio.h

Timestamp:

2015-11-02T20:54:19Z (10 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/c/generic/private/stdio.h (modified) (2 diffs)

uspace/lib/c/generic/private/stdio.h

@@ -39 +39 @@
 #include <stdio.h>
 #include <async.h>
+
+/** Maximum characters that can be pushed back by ungetc() */
+#define UNGETC_MAX 1
 
 struct _IO_FILE {
@@ -82 +85 @@
         /** Points to end of occupied space when in read mode. */
         uint8_t *buf_tail;
+
+        /** Pushed back characters */
+        uint8_t ungetc_buf[UNGETC_MAX];
+
+        /** Number of pushed back characters */
+        int ungetc_chars;
 };