From eb833da5700048953837bc75d42575ac771b2e67 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Sun, 27 Feb 2011 23:09:52 +0100 Subject: Find modules and config files relative to the installed libraries. Do not use replace %PULSE_ROOT% from the environment. --- src/pulsecore/core-util.c | 123 +++++++++++++++++----------------------------- src/pulsecore/core-util.h | 4 ++ src/pulsecore/dllmain.c | 4 +- 3 files changed, 51 insertions(+), 80 deletions(-) (limited to 'src/pulsecore') diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 8a377e37..fd3cc67a 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -146,24 +146,29 @@ static pa_strlist *recorded_env = NULL; #ifdef OS_IS_WIN32 -#define PULSE_ROOTENV "PULSE_ROOT" +/* Returns the directory of the current DLL, with '/bin/' removed if it is the last component */ +char *pa_win32_get_toplevel(HANDLE handle) { + static char *toplevel = NULL; -int pa_set_root(HANDLE handle) { - char library_path[MAX_PATH], *sep; + if (!toplevel) { + char library_path[MAX_PATH]; + char *p; - /* FIXME: Needs to set errno */ + if (!GetModuleFileName(handle, library_path, MAX_PATH)) + return NULL; - if (!GetModuleFileName(handle, library_path, MAX_PATH)) - return 0; + toplevel = pa_xstrdup(library_path); - sep = strrchr(library_path, PA_PATH_SEP_CHAR); - if (sep) - *sep = '\0'; + p = strrchr(toplevel, PA_PATH_SEP_CHAR); + if (p) + *p = '\0'; - if (!SetEnvironmentVariable(PULSE_ROOTENV, library_path)) - return 0; + p = strrchr(toplevel, PA_PATH_SEP_CHAR); + if (p && (strcmp(p + 1, "bin") == 0)) + *p = '\0'; + } - return 1; + return toplevel; } #endif @@ -699,7 +704,7 @@ int pa_make_realtime(int rtprio) { #elif defined(OS_IS_WIN32) /* Windows only allows realtime scheduling to be set on a per process basis. * Therefore, instead of making the thread realtime, just give it the highest non-realtime priority. */ - if(SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) { + if (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) { pa_log_info("Successfully enabled THREAD_PRIORITY_TIME_CRITICAL scheduling for thread."); return 0; } @@ -928,7 +933,7 @@ const char *pa_sig2str(int sig) { } #else - switch(sig) { + switch (sig) { #ifdef SIGHUP case SIGHUP: return "SIGHUP"; #endif @@ -1218,11 +1223,11 @@ int pa_lock_fd(int fd, int b) { return 0; } - pa_log("%slock: %s", !b? "un" : "", pa_cstrerror(errno)); + pa_log("%slock: %s", !b ? "un" : "", pa_cstrerror(errno)); #endif #ifdef OS_IS_WIN32 - HANDLE h = (HANDLE)_get_osfhandle(fd); + HANDLE h = (HANDLE) _get_osfhandle(fd); if (b && LockFile(h, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF)) return 0; @@ -1675,23 +1680,9 @@ fail: * stored there.*/ FILE *pa_open_config_file(const char *global, const char *local, const char *env, char **result) { const char *fn; -#ifdef OS_IS_WIN32 - char buf[PATH_MAX]; - - if (!getenv(PULSE_ROOTENV)) - pa_set_root(NULL); -#endif + FILE *f; if (env && (fn = getenv(env))) { - FILE *f; - -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - fn = buf; -#endif - if ((f = pa_fopen_cloexec(fn, "r"))) { if (result) *result = pa_xstrdup(fn); @@ -1707,7 +1698,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env const char *e; char *lfn; char *h; - FILE *f; if ((e = getenv("PULSE_CONFIG_PATH"))) fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local); @@ -1717,15 +1707,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env } else return NULL; -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) { - /* FIXME: Needs to set errno! */ - pa_xfree(lfn); - return NULL; - } - fn = buf; -#endif - if ((f = pa_fopen_cloexec(fn, "r"))) { if (result) *result = pa_xstrdup(fn); @@ -1744,22 +1725,26 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env } if (global) { - FILE *f; + char *gfn; #ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(global, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - global = buf; + if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0) + gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s", + pa_win32_get_toplevel(NULL), + global + strlen(PA_DEFAULT_CONFIG_DIR)); + else #endif + gfn = pa_xstrdup(global); - if ((f = pa_fopen_cloexec(global, "r"))) { - + if ((f = pa_fopen_cloexec(gfn, "r"))) { if (result) - *result = pa_xstrdup(global); + *result = gfn; + else + pa_xfree(gfn); return f; } + pa_xfree(gfn); } errno = ENOENT; @@ -1768,22 +1753,8 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env char *pa_find_config_file(const char *global, const char *local, const char *env) { const char *fn; -#ifdef OS_IS_WIN32 - char buf[PATH_MAX]; - - if (!getenv(PULSE_ROOTENV)) - pa_set_root(NULL); -#endif if (env && (fn = getenv(env))) { - -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - fn = buf; -#endif - if (access(fn, R_OK) == 0) return pa_xstrdup(fn); @@ -1804,15 +1775,6 @@ char *pa_find_config_file(const char *global, const char *local, const char *env } else return NULL; -#ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) { - /* FIXME: Needs to set errno! */ - pa_xfree(lfn); - return NULL; - } - fn = buf; -#endif - if (access(fn, R_OK) == 0) { char *r = pa_xstrdup(fn); pa_xfree(lfn); @@ -1829,15 +1791,20 @@ char *pa_find_config_file(const char *global, const char *local, const char *env } if (global) { + char *gfn; + #ifdef OS_IS_WIN32 - if (!ExpandEnvironmentStrings(global, buf, PATH_MAX)) - /* FIXME: Needs to set errno! */ - return NULL; - global = buf; + if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0) + gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s", + pa_win32_get_toplevel(NULL), + global + strlen(PA_DEFAULT_CONFIG_DIR)); + else #endif + gfn = pa_xstrdup(global); - if (access(global, R_OK) == 0) - return pa_xstrdup(global); + if (access(gfn, R_OK) == 0) + return gfn; + pa_xfree(gfn); } errno = ENOENT; diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index 8619330d..80b47395 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -271,4 +271,8 @@ void pa_nullify_stdfds(void); char *pa_read_line_from_file(const char *fn); pa_bool_t pa_running_in_vm(void); +#ifdef OS_IS_WIN32 +char *pa_win32_get_toplevel(HANDLE handle); +#endif + #endif diff --git a/src/pulsecore/dllmain.c b/src/pulsecore/dllmain.c index 491ec75f..c826bc08 100644 --- a/src/pulsecore/dllmain.c +++ b/src/pulsecore/dllmain.c @@ -31,7 +31,7 @@ #include -extern pa_set_root(HANDLE handle); +extern pa_win32_get_toplevel(HANDLE handle); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { WSADATA data; @@ -39,7 +39,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) { case DLL_PROCESS_ATTACH: - if (!pa_set_root(hinstDLL)) + if (!pa_win32_get_toplevel(hinstDLL)) return FALSE; WSAStartup(MAKEWORD(2, 0), &data); break; -- cgit From c470680e1ba008c05c13231dbbafd69cb9330488 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 1 Mar 2011 16:06:19 +0100 Subject: Use pulsecore/arpa-inet.h to make arpa/inet.h functionality available Automatically use replacement function on platforms (win32) where not all arpa/inet.h is available natively. --- src/pulsecore/arpa-inet.c | 108 ++++++++++++++++++++++++++++++++++++++++++ src/pulsecore/arpa-inet.h | 23 +++++++++ src/pulsecore/inet_ntop.c | 82 -------------------------------- src/pulsecore/inet_ntop.h | 12 ----- src/pulsecore/inet_pton.c | 63 ------------------------ src/pulsecore/inet_pton.h | 12 ----- src/pulsecore/ipacl.c | 8 +--- src/pulsecore/parseaddr.c | 6 +-- src/pulsecore/socket-client.c | 4 +- src/pulsecore/socket-server.c | 11 +---- src/pulsecore/socket-util.c | 8 +--- 11 files changed, 136 insertions(+), 201 deletions(-) create mode 100644 src/pulsecore/arpa-inet.c create mode 100644 src/pulsecore/arpa-inet.h delete mode 100644 src/pulsecore/inet_ntop.c delete mode 100644 src/pulsecore/inet_ntop.h delete mode 100644 src/pulsecore/inet_pton.c delete mode 100644 src/pulsecore/inet_pton.h (limited to 'src/pulsecore') diff --git a/src/pulsecore/arpa-inet.c b/src/pulsecore/arpa-inet.c new file mode 100644 index 00000000..3d6f316a --- /dev/null +++ b/src/pulsecore/arpa-inet.c @@ -0,0 +1,108 @@ +/*** + This file is part of PulseAudio. + + Copyright 2006 Pierre Ossman for Cendio AB + + PulseAudio is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + PulseAudio is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32) + +#include + +#include +#include +#include + +#include "arpa-inet.h" + +const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { + struct in_addr *in = (struct in_addr*)src; +#ifdef HAVE_IPV6 + struct in6_addr *in6 = (struct in6_addr*)src; +#endif + + pa_assert(src); + pa_assert(dst); + + switch (af) { + case AF_INET: + pa_snprintf(dst, cnt, "%d.%d.%d.%d", +#ifdef WORDS_BIGENDIAN + (int)(in->s_addr >> 24) & 0xff, + (int)(in->s_addr >> 16) & 0xff, + (int)(in->s_addr >> 8) & 0xff, + (int)(in->s_addr >> 0) & 0xff); +#else + (int)(in->s_addr >> 0) & 0xff, + (int)(in->s_addr >> 8) & 0xff, + (int)(in->s_addr >> 16) & 0xff, + (int)(in->s_addr >> 24) & 0xff); +#endif + break; +#ifdef HAVE_IPV6 + case AF_INET6: + pa_snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x", + in6->s6_addr[ 0] << 8 | in6->s6_addr[ 1], + in6->s6_addr[ 2] << 8 | in6->s6_addr[ 3], + in6->s6_addr[ 4] << 8 | in6->s6_addr[ 5], + in6->s6_addr[ 6] << 8 | in6->s6_addr[ 7], + in6->s6_addr[ 8] << 8 | in6->s6_addr[ 9], + in6->s6_addr[10] << 8 | in6->s6_addr[11], + in6->s6_addr[12] << 8 | in6->s6_addr[13], + in6->s6_addr[14] << 8 | in6->s6_addr[15]); + break; +#endif + default: + errno = EAFNOSUPPORT; + return NULL; + } + + return dst; +} + +int inet_pton(int af, const char *src, void *dst) { + struct in_addr *in = (struct in_addr*)dst; +#ifdef HAVE_IPV6 + struct in6_addr *in6 = (struct in6_addr*)dst; +#endif + + pa_assert(src); + pa_assert(dst); + + switch (af) { + case AF_INET: + in->s_addr = inet_addr(src); + if (in->s_addr == INADDR_NONE) + return 0; + break; +#ifdef HAVE_IPV6 + case AF_INET6: + /* FIXME */ +#endif + default: + errno = EAFNOSUPPORT; + return -1; + } + + return 1; +} + +#endif diff --git a/src/pulsecore/arpa-inet.h b/src/pulsecore/arpa-inet.h new file mode 100644 index 00000000..303c905b --- /dev/null +++ b/src/pulsecore/arpa-inet.h @@ -0,0 +1,23 @@ +#ifndef fooarpa_inethfoo +#define fooarpa_inethfoo + + +#if defined(HAVE_ARPA_INET_H) + +#include + +#elif defined(OS_IS_WIN32) + +/* On Windows winsock2.h (here included via pulsecore/socket.h) provides most of the functionality of arpa/inet.h, except for + * the inet_ntop and inet_pton functions, which are implemented here. */ + +#include + +const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); + +int inet_pton(int af, const char *src, void *dst); + +#endif + + +#endif diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/inet_ntop.c deleted file mode 100644 index 059b25cc..00000000 --- a/src/pulsecore/inet_ntop.c +++ /dev/null @@ -1,82 +0,0 @@ -/*** - This file is part of PulseAudio. - - Copyright 2006 Pierre Ossman for Cendio AB - - PulseAudio is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - PulseAudio is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#ifndef HAVE_INET_NTOP - -#include -#include -#include - -#include "inet_ntop.h" - -const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { - struct in_addr *in = (struct in_addr*)src; -#ifdef HAVE_IPV6 - struct in6_addr *in6 = (struct in6_addr*)src; -#endif - - pa_assert(src); - pa_assert(dst); - - switch (af) { - case AF_INET: - pa_snprintf(dst, cnt, "%d.%d.%d.%d", -#ifdef WORDS_BIGENDIAN - (int)(in->s_addr >> 24) & 0xff, - (int)(in->s_addr >> 16) & 0xff, - (int)(in->s_addr >> 8) & 0xff, - (int)(in->s_addr >> 0) & 0xff); -#else - (int)(in->s_addr >> 0) & 0xff, - (int)(in->s_addr >> 8) & 0xff, - (int)(in->s_addr >> 16) & 0xff, - (int)(in->s_addr >> 24) & 0xff); -#endif - break; -#ifdef HAVE_IPV6 - case AF_INET6: - pa_snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x", - in6->s6_addr[ 0] << 8 | in6->s6_addr[ 1], - in6->s6_addr[ 2] << 8 | in6->s6_addr[ 3], - in6->s6_addr[ 4] << 8 | in6->s6_addr[ 5], - in6->s6_addr[ 6] << 8 | in6->s6_addr[ 7], - in6->s6_addr[ 8] << 8 | in6->s6_addr[ 9], - in6->s6_addr[10] << 8 | in6->s6_addr[11], - in6->s6_addr[12] << 8 | in6->s6_addr[13], - in6->s6_addr[14] << 8 | in6->s6_addr[15]); - break; -#endif - default: - errno = EAFNOSUPPORT; - return NULL; - } - - return dst; -} - -#endif /* INET_NTOP */ diff --git a/src/pulsecore/inet_ntop.h b/src/pulsecore/inet_ntop.h deleted file mode 100644 index 77ace6a4..00000000 --- a/src/pulsecore/inet_ntop.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef fooinet_ntophfoo -#define fooinet_ntophfoo - -#ifndef HAVE_INET_NTOP - -#include - -const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); - -#endif - -#endif diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c deleted file mode 100644 index efb15263..00000000 --- a/src/pulsecore/inet_pton.c +++ /dev/null @@ -1,63 +0,0 @@ -/*** - This file is part of PulseAudio. - - Copyright 2006 Pierre Ossman for Cendio AB - - PulseAudio is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - PulseAudio is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#ifndef HAVE_INET_PTON - -#include -#include - -#include "inet_pton.h" - -int inet_pton(int af, const char *src, void *dst) { - struct in_addr *in = (struct in_addr*)dst; -#ifdef HAVE_IPV6 - struct in6_addr *in6 = (struct in6_addr*)dst; -#endif - - pa_assert(src); - pa_assert(dst); - - switch (af) { - case AF_INET: - in->s_addr = inet_addr(src); - if (in->s_addr == INADDR_NONE) - return 0; - break; -#ifdef HAVE_IPV6 - case AF_INET6: - /* FIXME */ -#endif - default: - errno = EAFNOSUPPORT; - return -1; - } - - return 1; -} - -#endif /* INET_PTON */ diff --git a/src/pulsecore/inet_pton.h b/src/pulsecore/inet_pton.h deleted file mode 100644 index 913efc4c..00000000 --- a/src/pulsecore/inet_pton.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef fooinet_ptonhfoo -#define fooinet_ptonhfoo - -#ifndef HAVE_INET_PTON - -#include - -int inet_pton(int af, const char *src, void *dst); - -#endif - -#endif diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c index 0cbe34af..3930ba61 100644 --- a/src/pulsecore/ipacl.c +++ b/src/pulsecore/ipacl.c @@ -37,9 +37,6 @@ #ifdef HAVE_NETINET_IP_H #include #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif #include @@ -48,10 +45,7 @@ #include #include #include - -#ifndef HAVE_INET_PTON -#include -#endif +#include #include "ipacl.h" diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c index 99fdcbf4..4b6cf9db 100644 --- a/src/pulsecore/parseaddr.c +++ b/src/pulsecore/parseaddr.c @@ -26,16 +26,12 @@ #include #include -#ifdef HAVE_ARPA_INET_H -#include -#endif - #include #include #include #include -#include +#include #include "parseaddr.h" diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c index ae7abc9e..23d5d880 100644 --- a/src/pulsecore/socket-client.c +++ b/src/pulsecore/socket-client.c @@ -35,9 +35,6 @@ #ifdef HAVE_SYS_UN_H #include #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif #ifdef HAVE_NETINET_IN_H #include #endif @@ -63,6 +60,7 @@ #include #include #include +#include #include "socket-client.h" diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c index e45ded04..23096a0d 100644 --- a/src/pulsecore/socket-server.c +++ b/src/pulsecore/socket-server.c @@ -39,9 +39,6 @@ ((size_t)(((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path)) #endif #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif #ifdef HAVE_NETINET_IN_H #include #endif @@ -50,13 +47,6 @@ #include #endif -#ifndef HAVE_INET_NTOP -#include -#endif -#ifndef HAVE_INET_PTON -#include -#endif - #include #include @@ -67,6 +57,7 @@ #include #include #include +#include #include "socket-server.h" diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c index 0b16e0f9..3023395c 100644 --- a/src/pulsecore/socket-util.c +++ b/src/pulsecore/socket-util.c @@ -54,13 +54,6 @@ #ifdef HAVE_NETDB_H #include #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif - -#ifndef HAVE_INET_NTOP -#include -#endif #include @@ -69,6 +62,7 @@ #include #include #include +#include #include "socket-util.h" -- cgit From b599d3c836c7a5c4c665339279a47da8be914789 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 15 Mar 2011 21:06:46 +0100 Subject: Fix pa_rtclock_from_wallclock The HAVE_CLOCK_GETTIME macro protects timespec and related functions, nothing of which is used in pa_rtclock_from_wallclock. And silently just not converting was not the proper solution anyway. Also add an assert in pulse/mainloop.c to report the integer overflow that was triggered by the wrong pa_rtclock_from_wallclock. Without the assert, debugging was painful. --- src/pulsecore/core-rtclock.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/pulsecore') diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c index ac2c097a..331ac112 100644 --- a/src/pulsecore/core-rtclock.c +++ b/src/pulsecore/core-rtclock.c @@ -182,15 +182,13 @@ void pa_rtclock_hrtimer_enable(void) { } struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) { - -#ifdef HAVE_CLOCK_GETTIME struct timeval wc_now, rt_now; + pa_assert(tv); + pa_gettimeofday(&wc_now); pa_rtclock_get(&rt_now); - pa_assert(tv); - /* pa_timeval_sub() saturates on underflow! */ if (pa_timeval_cmp(&wc_now, tv) < 0) @@ -199,7 +197,6 @@ struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) { pa_timeval_sub(&rt_now, pa_timeval_diff(&wc_now, tv)); *tv = rt_now; -#endif return tv; } @@ -232,15 +229,13 @@ struct timespec* pa_timespec_store(struct timespec *ts, pa_usec_t v) { #endif static struct timeval* wallclock_from_rtclock(struct timeval *tv) { - -#ifdef HAVE_CLOCK_GETTIME struct timeval wc_now, rt_now; + pa_assert(tv); + pa_gettimeofday(&wc_now); pa_rtclock_get(&rt_now); - pa_assert(tv); - /* pa_timeval_sub() saturates on underflow! */ if (pa_timeval_cmp(&rt_now, tv) < 0) @@ -249,7 +244,6 @@ static struct timeval* wallclock_from_rtclock(struct timeval *tv) { pa_timeval_sub(&wc_now, pa_timeval_diff(&rt_now, tv)); *tv = wc_now; -#endif return tv; } -- cgit