Changeset 52acfab in mainline for uspace/lib/posix/include/posix/unistd.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/posix/include/posix/unistd.h (modified) (3 diffs)

uspace/lib/posix/include/posix/unistd.h

@@ -46 +46 @@
 /* Process Termination */
 #define _exit exit
+
+/* Standard Streams */
+#define STDIN_FILENO (fileno(stdin))
+#define STDOUT_FILENO (fileno(stdout))
+#define STDERR_FILENO (fileno(stderr))
+
+#define F_OK 0 /* Test for existence. */
+#define X_OK 1 /* Test for execute permission. */
+#define W_OK 2 /* Test for write permission. */
+#define R_OK 4 /* Test for read permission. */
+
+__C_DECLS_BEGIN;
 
 extern char *optarg;
@@ -106 +118 @@
 #endif
 
-/* Standard Streams */
-#undef STDIN_FILENO
-#define STDIN_FILENO (fileno(stdin))
-#undef STDOUT_FILENO
-#define STDOUT_FILENO (fileno(stdout))
-#undef STDERR_FILENO
-#define STDERR_FILENO (fileno(stderr))
-
 /* File Accessibility */
-#undef F_OK
-#undef X_OK
-#undef W_OK
-#undef R_OK
-#define F_OK 0 /* Test for existence. */
-#define X_OK 1 /* Test for execute permission. */
-#define W_OK 2 /* Test for write permission. */
-#define R_OK 4 /* Test for read permission. */
 extern int access(const char *path, int amode);
 
@@ -171 +167 @@
 extern unsigned int alarm(unsigned int);
 
+__C_DECLS_END;
+
 #endif /* POSIX_UNISTD_H_ */