Commit 13d51420 authored by Stefan Westerfeld's avatar Stefan Westerfeld

Merge branch 'macos-fixes'

parents c9c3b7bf 3f69aa2b
......@@ -9,6 +9,8 @@ COMMON_SRC = utils.hh utils.cc convcode.hh convcode.cc random.hh random.cc wavda
wmget.cc wmadd.cc
COMMON_LIBS = $(SNDFILE_LIBS) $(FFTW_LIBS) $(LIBGCRYPT_LIBS) $(LIBMPG123_LIBS) $(FFMPEG_LIBS)
AM_CXXFLAGS = $(SNDFILE_CFLAGS) $(FFTW_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBMPG123_CFLAGS) $(FFMPEG_CFLAGS)
audiowmark_SOURCES = audiowmark.cc $(COMMON_SRC)
audiowmark_LDFLAGS = $(COMMON_LIBS)
......
......@@ -17,6 +17,8 @@
#include "rawconverter.hh"
#include <array>
#include <math.h>
using std::vector;
......
......@@ -20,6 +20,7 @@
#include <assert.h>
#include <string.h>
#include <errno.h>
using std::string;
using std::vector;
......
......@@ -19,6 +19,7 @@
#include <assert.h>
#include <string.h>
#include <errno.h>
using std::string;
using std::vector;
......
......@@ -18,6 +18,8 @@
#include "utils.hh"
#include "random.hh"
#include <inttypes.h>
using std::vector;
using std::string;
......@@ -28,7 +30,7 @@ main (int argc, char **argv)
for (size_t i = 0; i < 20; i++)
{
uint64_t x = rng();
printf ("%016lx\n", x);
printf ("%016" PRIx64 "\n", x);
}
uint64_t s = 0;
......@@ -39,7 +41,7 @@ main (int argc, char **argv)
s += rng();
}
double t_end = get_time();
printf ("s=%016lx\n\n", s);
printf ("s=%016" PRIx64 "\n\n", s);
printf ("%f Mvalues/sec\n", runs / (t_end - t_start) / 1000000);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment