Ignore:
Timestamp:
2019-02-12T20:42:42Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f31ca47
Parents:
7f7817a9 (diff), 4805495 (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.
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)
Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/posix/include/posix/string.h

    r7f7817a9 rab936440  
    5959extern char *stpncpy(char *__restrict__ dest, const char *__restrict__ src, size_t n);
    6060extern void *memccpy(void *__restrict__ dest, const void *__restrict__ src, int c, size_t n);
    61 extern char *strdup(const char *s);
    62 extern char *strndup(const char *s, size_t n);
    6361
    6462/* Search Functions */
     
    7068/* Error Messages */
    7169extern int strerror_r(int errnum, char *buf, size_t bufsz);
    72 
    73 /* String Length */
    74 extern size_t strnlen(const char *s, size_t n);
    7570
    7671/* Signal Messages */
Note: See TracChangeset for help on using the changeset viewer.