Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset db6e419 in mainline for uspace/lib/imgmap/imgmap.h


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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:

Merge mainline changes.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/imgmap/imgmap.h

    re0e922d rdb6e419  
    11/*
    2  * Copyright (c) 2011 Jiri Svoboda
     2 * Copyright (c) 2011 Martin Decky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup generic
     29/** @addtogroup imgmap
    3030 * @{
    3131 */
    32 /** @file
    33  *
    34  * This header allows including a kernel header using typedefs.h from
    35  * libc. User-space code should use sys/types.h directly.
     32/**
     33 * @file
    3634 */
    3735
    38 #ifndef LIBC_TYPEDEFS_H_
    39 #define LIBC_TYPEDEFS_H_
     36#ifndef IMGMAP_IMGMAP_H_
     37#define IMGMAP_IMGMAP_H_
    4038
    4139#include <sys/types.h>
     40#include <abi/fb/visuals.h>
     41
     42typedef struct {
     43        size_t size;
     44        sysarg_t width;
     45        sysarg_t height;
     46        visual_t visual;
     47        uint8_t data[];
     48} imgmap_t;
     49
     50extern imgmap_t *imgmap_decode_tga(void *, size_t);
    4251
    4352#endif
Note: See TracChangeset for help on using the changeset viewer.