Changeset 5762:c517ca277cd0 in roaraudio


Ignore:
Timestamp:
11/21/12 02:32:00 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

avoid warnings

Location:
include
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/notify.h

    r5381 r5762  
    6060struct roar_notify_core; 
    6161 
    62 #define ROAR_EVENT_GET_TYPE(x) ((x) == NULL ? -1 : ((x)->flags & ROAR_EVENT_FLAG_PROXYEVENT ? (x)->event_proxy : (x)->event)) 
     62#define ROAR_EVENT_GET_TYPE(x) ((x) == NULL ? ROAR_NOTIFY_SPECIAL : ((x)->flags & ROAR_EVENT_FLAG_PROXYEVENT ? (x)->event_proxy : (x)->event)) 
    6363 
    6464struct roar_notify_core * roar_notify_core_new(ssize_t lists); 
  • include/roaraudio/notify.h

    r5381 r5762  
    5252#define ROAR_NOTIFY_MASK_USER     (uint32_t)0x3fffffff 
    5353 
    54 #define ROAR_NOTIFY_X2EVENT(x,offset,mask) ((x) == -1 ? ROAR_NOTIFY_SPECIAL : (((x) & (mask))+(offset))) 
    55 #define ROAR_NOTIFY_EVENT2X(x,offset,mask) (ROAR_NOTIFY_IS_X((x),(offset),(mask)) != 1 ? -1 : ((x) - (offset))) 
     54#define ROAR_NOTIFY_X2EVENT(x,offset,mask) ((x) == (uint32_t)-1 ? ROAR_NOTIFY_SPECIAL : (((x) & (mask))+(offset))) 
     55#define ROAR_NOTIFY_EVENT2X(x,offset,mask) (ROAR_NOTIFY_IS_X((x),(offset),(mask)) != 1 ? (uint32_t)-1 : ((x) - (offset))) 
    5656#define ROAR_NOTIFY_IS_X(x,offset,mask)    ((x) == ROAR_NOTIFY_SPECIAL ? -1 : (((x) | (mask)) - (mask)) == (offset) ? 1 : 0) 
    5757 
Note: See TracChangeset for help on using the changeset viewer.