diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:18:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:51:26 +0100 |
| commit | e12c679b8cc8a263507c556cb24819dc0d5559b9 (patch) | |
| tree | 8f2cd06710d15ca64a4a86c1ce52bc975ec3f2b0 /src/Flowgraph.cpp | |
| parent | d82422fbb3d9d34a0566197245376548ce3ef14e (diff) | |
| parent | 94c1f63b6fd07d74f3325274dd19fd6beaf53965 (diff) | |
| download | dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.gz dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.bz2 dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.zip | |
Merge raspine's ZeroMQ RC and UHD staticdelay
Merge raspine/master pull request, fix indentation, code style, and two
minor conflicts in:
doc/example.ini
src/DabMod.cpp
Diffstat (limited to 'src/Flowgraph.cpp')
| -rw-r--r-- | src/Flowgraph.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Flowgraph.cpp b/src/Flowgraph.cpp index 4e44f28..dd9c68b 100644 --- a/src/Flowgraph.cpp +++ b/src/Flowgraph.cpp @@ -23,10 +23,10 @@ #include "PcDebug.h" -#ifdef __ppc__ -# define memalign(a, b) malloc(b) -#else // !__ppc__ +#if HAVE_DECL__MM_MALLOC # include <mm_malloc.h> +#else +# define memalign(a, b) malloc(b) #endif #include <sys/types.h> #include <stdexcept> |