Changeset b4b534ac in mainline for uspace/lib/c


Ignore:
Timestamp:
2016-07-22T08:24:47Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f76d2c2
Parents:
5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

Location:
uspace/lib/c
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/l18n/langs.c

    r5b18137 rb4b534ac  
    6666                case L18N_WIN_LOCALE_ZULU:
    6767                        return "Zulu";
     68                default:
     69                        break;
    6870        }
    6971

  • uspace/lib/c/include/adt/list.h

    r5b18137 rb4b534ac  
    133133
    134134/** Returns true if the link is definitely part of a list. False if not sure. */
    135 static inline bool link_in_use(link_t *link)
     135static inline bool link_in_use(const link_t *link)
    136136{
    137137        return link->prev != NULL && link->next != NULL;
    … …  
    263263 *
    264264 */
    265 static inline link_t *list_last(list_t *list)
     265static inline link_t *list_last(const list_t *list)
    266266{
    267267        return (list->head.prev == &list->head) ? NULL : list->head.prev;
    … …  
    276276 *
    277277 */
    278 static inline link_t *list_next(link_t *link, const list_t *list)
     278static inline link_t *list_next(const link_t *link, const list_t *list)
    279279{
    280280        return (link->next == &list->head) ? NULL : link->next;
    … …  
    289289 *
    290290 */
    291 static inline link_t *list_prev(link_t *link, const list_t *list)
     291static inline link_t *list_prev(const link_t *link, const list_t *list)
    292292{
    293293        return (link->prev == &list->head) ? NULL : link->prev;
    … …  
    357357 *
    358358 */
    359 static inline link_t *list_nth(list_t *list, unsigned long n)
     359static inline link_t *list_nth(const list_t *list, unsigned long n)
    360360{
    361361        unsigned long cnt = 0;

  • uspace/lib/c/include/l18n/langs.h

    r5b18137 rb4b534ac  
    5454        L18N_WIN_LOCALE_SPANISH_TRADITIONAL = 0x040A,
    5555        /* ... */
    56         L18N_WIN_LOCALE_ZULU = 0x0435
     56        L18N_WIN_LOCALE_ZULU = 0x0435,
     57        L18N_WIN_LOCALE_MAX = 0xFFFF
    5758} l18_win_locales_t;
    5859

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

    r5b18137 rb4b534ac  
    6969#define PADD8 _padd(8, __LINE__)
    7070
     71#define STATIC_ASSERT(cond) int sassert[(cond) ? 1 : -1]
     72
    7173/** @}
    7274 */
Note: See TracChangeset for help on using the changeset viewer.