Skip to content

Just #define _GNU_SOURCE and _USE_MATH_MACROS unconditionally #1419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sethk wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −24
Open

Just #define _GNU_SOURCE and _USE_MATH_MACROS unconditionally #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions libvmaf/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,8 @@ cc = meson.get_compiler('c')
libvmaf_inc = include_directories(['include'])

# Arguments in test_args will be used even on feature tests
test_args = []
if host_machine.system() == 'linux' or host_machine.system() == 'windows' or host_machine.system() == 'cygwin'
test_args += '-D_GNU_SOURCE'
add_project_arguments('-D_GNU_SOURCE', language: ['c', 'cpp'])
elif host_machine.system() == 'darwin'
test_args += '-D_DARWIN_C_SOURCE'
add_project_arguments('-D_DARWIN_C_SOURCE', language: ['c', 'cpp'])
endif
test_args = ['-D_GNU_SOURCE', '-D_USE_MATH_DEFINES']
add_project_arguments(test_args, language: ['c', 'cpp'])

# Header checks
stdatomic_dependency = []
Expand Down
4 changes: 0 additions & 4 deletions libvmaf/src/feature/adm_tools.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
#include "adm_options.h"
#include "adm_tools.h"

#ifndef M_PI
#define M_PI 3.1415926535897932384626433832795028841971693993751
#endif

#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#define MAX(x, y) (((x) > (y)) ? (x) : (y))

Expand Down
4 changes: 0 additions & 4 deletions libvmaf/src/feature/adm_tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
#include <math.h>
#include "common/macros.h"

#ifndef M_PI
#define M_PI 3.14159265358979323846264338327
#endif

#pragma once

#ifndef ADM_TOOLS_H_
Expand Down
4 changes: 0 additions & 4 deletions libvmaf/src/feature/integer_adm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ typedef struct AdmBuffer {
#define NUM_BUFS_ADM 30
#endif

#ifndef M_PI
#define M_PI 3.14159265358979323846264338327
#endif // M_PI

/* Enhancement gain imposed on adm, must be >= 1.0, where 1.0 means the gain is completely disabled */
#ifndef DEFAULT_ADM_ENHN_GAIN_LIMIT
#define DEFAULT_ADM_ENHN_GAIN_LIMIT (100.0)
Expand Down
4 changes: 0 additions & 4 deletions libvmaf/src/feature/integer_ssim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define KERNEL_WEIGHT (1<<KERNEL_SHIFT)
#define KERNEL_ROUND ((1<<KERNEL_SHIFT)>>1)

#ifndef M_PI
#define M_PI 3.141592653589793238462643
#endif

static int gaussian_filter_init(unsigned **_kernel,double _sigma,int _max_len){
unsigned *kernel;
double scale;
Expand Down
Loading