mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-07 13:30:03 -05:00
fix linker warning macro code, move pa_strnull() to core-util.h, move PA_LIKELY definitions here from gccmacro.h
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2248 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
d0ebb71eed
commit
50d585e458
1 changed files with 15 additions and 9 deletions
|
|
@ -33,12 +33,22 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#include <pulsecore/log.h>
|
||||
#include <pulsecore/gccmacro.h>
|
||||
#include <pulse/gccmacro.h>
|
||||
|
||||
#ifndef PACKAGE
|
||||
#error "Please include config.h before including this file!"
|
||||
#endif
|
||||
|
||||
#ifndef PA_LIKELY
|
||||
#ifdef __GNUC__
|
||||
#define PA_LIKELY(x) (__builtin_expect(!!(x),1))
|
||||
#define PA_UNLIKELY(x) (__builtin_expect((x),0))
|
||||
#else
|
||||
#define PA_LIKELY(x) (x)
|
||||
#define PA_UNLIKELY(x) (x)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(PAGE_SIZE)
|
||||
#define PA_PAGE_SIZE ((size_t) PAGE_SIZE)
|
||||
#elif defined(PAGESIZE)
|
||||
|
|
@ -200,20 +210,16 @@ typedef int pa_bool_t;
|
|||
#define PA_PATH_SEP_CHAR '/'
|
||||
#endif
|
||||
|
||||
static inline const char *pa_strnull(const char *x) {
|
||||
return x ? x : "(null)";
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
||||
#define PA_WARN_REFERENCE(sym,msg) \
|
||||
__asm__(".section .gnu.warning.sym"); \
|
||||
__asm__(".asciz \"msg\""); \
|
||||
#define PA_WARN_REFERENCE(sym, msg) \
|
||||
__asm__(".section .gnu.warning." #sym); \
|
||||
__asm__(".asciz \"" msg "\""); \
|
||||
__asm__(".previous")
|
||||
|
||||
#else
|
||||
|
||||
#define PA_WARN_REFERENCE(sym,msg)
|
||||
#define PA_WARN_REFERENCE(sym, msg)
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue