smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Use consistent defines for header availability

Browse source
This commit is contained in:
Robin Gareus 2025-11-09 20:22:33 +01:00
parent 83d44860e0
commit 1ee5a68d76
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/wscript
View file

@ -346,7 +346,7 @@ def configure(conf):
conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False) conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False)
conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False) conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False)
conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False) conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False)
have_sys_ioprio = conf.check_cc( have_sys_ioprio = conf.check_cc(
msg="Checking for 'ioprio_set' syscall support", msg="Checking for 'ioprio_set' syscall support",

6
libs/pbd/boost_debug.cc
View file

@ -19,7 +19,7 @@
#include "libpbd-config.h" #include "libpbd-config.h"
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
#include <execinfo.h> #include <execinfo.h>
#endif #endif
@ -47,7 +47,7 @@ std::ostream& operator<< (std::ostream& str, const Backtrace& bt) { return bt.pr
Backtrace::Backtrace() Backtrace::Backtrace()
{ {
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
size = ::backtrace (trace, 200); size = ::backtrace (trace, 200);
#endif #endif
} }
@ -59,7 +59,7 @@ Backtrace::print (std::ostream& str) const
size_t i; size_t i;
if (size) { if (size) {
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
strings = ::backtrace_symbols (trace, size); strings = ::backtrace_symbols (trace, size);
#endif #endif
if (strings) { if (strings) {

2
libs/pbd/cpus.cc
View file

@ -83,7 +83,7 @@ PBD::hardware_concurrency()
int count; int count;
size_t size=sizeof(count); size_t size=sizeof(count);
return sysctlbyname("hw.ncpu",&count,&size,NULL,0)?0:count; return sysctlbyname("hw.ncpu",&count,&size,NULL,0)?0:count;
#elif defined(HAVE_UNISTD) && defined(_SC_NPROCESSORS_ONLN) #elif defined(HAVE_UNISTD_H) && defined(_SC_NPROCESSORS_ONLN)
int const count=sysconf(_SC_NPROCESSORS_ONLN); int const count=sysconf(_SC_NPROCESSORS_ONLN);
return (count>0)?count:0; return (count>0)?count:0;
#elif defined(PLATFORM_WINDOWS) #elif defined(PLATFORM_WINDOWS)

8
libs/pbd/pbd/stacktrace.h
View file

@ -30,7 +30,7 @@
#include <glibmm/threads.h> #include <glibmm/threads.h>
#include <list> #include <list>
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
#include <execinfo.h> #include <execinfo.h>
#include <cstdlib> #include <cstdlib>
#endif #endif
@ -51,7 +51,7 @@ class /*LIBPBD_API*/ thing_with_backtrace
public: public:
thing_with_backtrace () { thing_with_backtrace () {
trace_twb(); trace_twb();
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
allocation_backtrace = new void*[50]; allocation_backtrace = new void*[50];
allocation_backtrace_size = backtrace (allocation_backtrace, 50); allocation_backtrace_size = backtrace (allocation_backtrace, 50);
#else #else
@ -63,7 +63,7 @@ public:
thing_with_backtrace (const thing_with_backtrace<T>& other) { thing_with_backtrace (const thing_with_backtrace<T>& other) {
trace_twb(); trace_twb();
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
allocation_backtrace = new void*[50]; allocation_backtrace = new void*[50];
allocation_backtrace_size = backtrace (allocation_backtrace, 50); allocation_backtrace_size = backtrace (allocation_backtrace, 50);
#else #else
@ -87,7 +87,7 @@ public:
} }
static void peek_a_boo (std::ostream& stream) { static void peek_a_boo (std::ostream& stream) {
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
typename std::list<thing_with_backtrace<T>*>::iterator x; typename std::list<thing_with_backtrace<T>*>::iterator x;
for (x = all.begin(); x != all.end(); ++x) { for (x = all.begin(); x != all.end(); ++x) {
char **strings; char **strings;

2
libs/pbd/stacktrace.cc
View file

@ -44,7 +44,7 @@ PBD::trace_twb ()
/* Obtain a backtrace and print it to stdout. */ /* Obtain a backtrace and print it to stdout. */
#ifdef HAVE_EXECINFO #ifdef HAVE_EXECINFO_H
#include <execinfo.h> #include <execinfo.h>

4
libs/pbd/wscript
View file

@ -104,8 +104,8 @@ def configure(conf):
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True)
autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True)
conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False) conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO_H',mandatory=False)
conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False) conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False)
conf.env.append_value('CFLAGS', "-D_POSIX_C_SOURCE=200809L") conf.env.append_value('CFLAGS', "-D_POSIX_C_SOURCE=200809L")
if not Options.options.ppc: if not Options.options.ppc:
conf.check_cc( conf.check_cc(