Changeset bc73be3 in mainline for uspace/lib/c/arch/arm32/src/rtld/dynamic.c

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/arch/arm32/src/rtld/dynamic.c (moved) (moved from uspace/lib/draw/codec/webp.h ) (3 diffs)

uspace/lib/c/arch/arm32/src/rtld/dynamic.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2014 Martin Decky
+ * Copyright (c) 2019 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup draw
+/** @addtogroup libcarm32
+ * @brief
  * @{
  */
@@ -34 +35 @@
  */
 
-#ifndef DRAW_CODEC_WEBP_H_
-#define DRAW_CODEC_WEBP_H_
+#include <stdio.h>
+#include <stdlib.h>
 
-#include <stddef.h>
-#include "../surface.h"
+#include <rtld/elf_dyn.h>
+#include <rtld/dynamic.h>
 
-extern surface_t *decode_webp(void *, size_t, surface_flags_t);
-extern bool encode_webp(surface_t *, void **, size_t *);
-
-#endif
+void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
+{
+        (void) dp;
+        (void) bias;
+        (void) info;
+}
 
 /** @}