Ignore:
Timestamp:
2020-03-15T10:44:02Z (6 years ago)
Author:
GitHub <noreply@…>
Parents:
b401b33 (diff), 44dde42 (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:
heiducteam <tristanided@…> (2020-03-15 10:44:02)
git-committer:
GitHub <noreply@…> (2020-03-15 10:44:02)
Message:

Merge pull request #1 from HelenOS/master

sync

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ia64/src/rtld/dynamic.c

    rb401b33 re28175d  
    11/*
    2  * Copyright (c) 2014 Martin Decky
     2 * Copyright (c) 2019 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup draw
     29/** @addtogroup libcia64
     30 * @brief
    3031 * @{
    3132 */
     
    3435 */
    3536
    36 #ifndef DRAW_CODEC_WEBP_H_
    37 #define DRAW_CODEC_WEBP_H_
     37#include <stdio.h>
     38#include <stdlib.h>
    3839
    39 #include <stddef.h>
    40 #include "../surface.h"
     40#include <rtld/elf_dyn.h>
     41#include <rtld/dynamic.h>
    4142
    42 extern surface_t *decode_webp(void *, size_t, surface_flags_t);
    43 extern bool encode_webp(surface_t *, void **, size_t *);
    44 
    45 #endif
     43void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
     44{
     45        (void) dp;
     46        (void) bias;
     47        (void) info;
     48}
    4649
    4750/** @}
Note: See TracChangeset for help on using the changeset viewer.