Changeset bc73be3 in mainline for uspace/lib/c/include/dlfcn.h


Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/dlfcn.h

    rad40b74b rbc73be3  
    3434 */
    3535
    36 #ifndef LIBC_DLFCN_H_
    37 #define LIBC_DLFCN_H_
     36#ifndef _LIBC_DLFCN_H_
     37#define _LIBC_DLFCN_H_
     38
     39#include <_bits/decls.h>
     40
     41__C_DECLS_BEGIN;
    3842
    3943void *dlopen(const char *, int);
    4044void *dlsym(void *, const char *);
     45
     46__C_DECLS_END;
    4147
    4248#endif
Note: See TracChangeset for help on using the changeset viewer.