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

Timestamp:

2019-05-28T19:24:14Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

77de449e

Parents:

af5037d (diff), bebd154 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-28 19:24:14)

git-committer:

GitHub <noreply@…> (2019-05-28 19:24:14)

Message:

Merge pull request #161 from le-jzr/cxxcompat2

C++ compatibility improvements

File:

• uspace/lib/c/generic/private/stdio.h (modified) (4 diffs)

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

@@ -40 +40 @@
 #include <async.h>
 #include <stddef.h>
+#include <offset.h>
 
 /** Maximum characters that can be pushed back by ungetc() */
@@ -54 +55 @@
         int (*flush)(FILE *stream);
 } __stream_ops_t;
+
+enum __buffer_state {
+        /** Buffer is empty */
+        _bs_empty,
+
+        /** Buffer contains data to be written */
+        _bs_write,
+
+        /** Buffer contains prefetched data for reading */
+        _bs_read
+};
 
 struct _IO_FILE {
@@ -87 +99 @@
 
         /** Buffering type */
-        enum _buffer_type btype;
+        enum __buffer_type btype;
 
         /** Buffer */
@@ -96 +108 @@
 
         /** Buffer state */
-        enum _buffer_state buf_state;
+        enum __buffer_state buf_state;
 
         /** Buffer I/O pointer */