Changeset df217a6 in mainline for uspace/lib/posix/unistd.c

Timestamp:

2011-07-23T20:21:56Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

c62f2d0

Parents:

65b4aac1 (diff), b9a46fc (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 pcc changes.

File:

• uspace/lib/posix/unistd.c (modified) (1 diff)

uspace/lib/posix/unistd.c

@@ -89 +89 @@
 {
         /* Always returns false, because there is no easy way to find
+<<<<<<< TREE
      * out under HelenOS. */
         return 0;
+=======
+         * out under HelenOS. */
+        return false;
+>>>>>>> MERGE-SOURCE
 }