Changeset 2b3dd78 in mainline for uspace/lib/posix/src/fcntl.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/fcntl.c (moved) (moved from uspace/lib/posix/source/fcntl.c ) (3 diffs)

uspace/lib/posix/src/fcntl.c

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "internal/common.h"
 #include "posix/fcntl.h"
@@ -51 +48 @@
  *     to the requested operation.
  */
-int posix_fcntl(int fd, int cmd, ...)
+int fcntl(int fd, int cmd, ...)
 {
         int flags;
@@ -102 +99 @@
  * @param posix_flags Access mode flags.
  */
-int posix_open(const char *pathname, int posix_flags, ...)
+int open(const char *pathname, int posix_flags, ...)
 {
-        posix_mode_t posix_mode = 0;
+        mode_t posix_mode = 0;
         if (posix_flags & O_CREAT) {
                 va_list args;
                 va_start(args, posix_flags);
-                posix_mode = va_arg(args, posix_mode_t);
+                posix_mode = va_arg(args, mode_t);
                 va_end(args);
                 (void) posix_mode;