Changeset b6759f4 in mainline

Timestamp:

2011-07-29T14:53:59Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

814717fa, e106599

Parents:

00c2de63

Message:

Fix conflict introduced in mainline.

File:

• uspace/app/pcc/cc/cpp/cpp.c (modified) (2 diffs)

uspace/app/pcc/cc/cpp/cpp.c

@@ -1708 +1708 @@
 }
 
-ssize_t
-write_all(int fd, const void* buffer, size_t count)
+static ssize_t
+_write_all(int fd, const void* buffer, size_t count)
 {
         size_t remaining = count;
@@ -1728 +1728 @@
         if (obufp == 0)
                 return;
-        if (Mflag == 0 && write_all(ofd, outbuf, obufp) < 0)
+        if (Mflag == 0 && _write_all(ofd, outbuf, obufp) < 0)
                 error("obuf write error");
         lastoch = outbuf[obufp-1];