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

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:

• uspace/lib/c/include/rtld/module.h (modified) (2 diffs)

uspace/lib/c/include/rtld/module.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_RTLD_MODULE_H_
-#define LIBC_RTLD_MODULE_H_
+#ifndef _LIBC_RTLD_MODULE_H_
+#define _LIBC_RTLD_MODULE_H_
 
 #include <rtld/dynamic.h>
@@ -45 +45 @@
 extern module_t *module_find(rtld_t *, const char *);
 extern module_t *module_load(rtld_t *, const char *, mlflags_t);
-extern void module_load_deps(module_t *, mlflags_t);
+extern errno_t module_load_deps(module_t *, mlflags_t);
 extern module_t *module_by_id(rtld_t *, unsigned long);