Changeset 224174f in mainline for uspace/lib/posix/include/posix/fcntl.h

Timestamp:

2013-07-11T13:16:57Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

2b3e8840, b2c96093

Parents:

990ab7d (diff), 3a67d63 (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/include/posix/fcntl.h (modified) (2 diffs)

uspace/lib/posix/include/posix/fcntl.h

@@ -35 +35 @@
 #ifndef POSIX_FCNTL_H_
 #define POSIX_FCNTL_H_
+
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
 
 #include "sys/types.h"
@@ -76 +80 @@
 #define FD_CLOEXEC         1 /* Close on exec. */
 
-extern int posix_open(const char *pathname, int flags, ...);
-extern int posix_fcntl(int fd, int cmd, ...);
+extern int __POSIX_DEF__(open)(const char *pathname, int flags, ...);
+extern int __POSIX_DEF__(fcntl)(int fd, int cmd, ...);
 
-#ifndef LIBPOSIX_INTERNAL
-        #define fcntl posix_fcntl
-        #define open posix_open
-#endif
 
 #endif /* POSIX_FCNTL_H_ */