Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset b6759f4 in mainline


Ignore:
Timestamp:
2011-07-29T14:53:59Z (10 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master
Children:
814717fa, e106599
Parents:
00c2de63
Message:

Fix conflict introduced in mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/pcc/cc/cpp/cpp.c

    r00c2de63 rb6759f4  
    17081708}
    17091709
    1710 ssize_t
    1711 write_all(int fd, const void* buffer, size_t count)
     1710static ssize_t
     1711_write_all(int fd, const void* buffer, size_t count)
    17121712{
    17131713        size_t remaining = count;
     
    17281728        if (obufp == 0)
    17291729                return;
    1730         if (Mflag == 0 && write_all(ofd, outbuf, obufp) < 0)
     1730        if (Mflag == 0 && _write_all(ofd, outbuf, obufp) < 0)
    17311731                error("obuf write error");
    17321732        lastoch = outbuf[obufp-1];
Note: See TracChangeset for help on using the changeset viewer.