diff options
| author | Tom Rondeau | 2011-12-04 11:19:19 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-12-04 11:19:19 -0500 |
| commit | 5c1576570e156633c9531932baa79fda9ff9a573 (patch) | |
| tree | 92984dba6b7af9f36a1f3a27b662cf88b0d4b6cf /volk/gen/make_cpuid_c.py | |
| parent | 0e7c799e4ef7a392a8ffe47170666908bfcb183f (diff) | |
| parent | a6b5389139341784edf30d512aa42360d3a8cf02 (diff) | |
| download | gnuradio-5c1576570e156633c9531932baa79fda9ff9a573.tar.gz gnuradio-5c1576570e156633c9531932baa79fda9ff9a573.tar.bz2 gnuradio-5c1576570e156633c9531932baa79fda9ff9a573.zip | |
Merge branch 'master' of gnuradio.org:gnuradio
Conflicts:
docs/doxygen/Doxyfile.in
Diffstat (limited to 'volk/gen/make_cpuid_c.py')
| -rw-r--r-- | volk/gen/make_cpuid_c.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/volk/gen/make_cpuid_c.py b/volk/gen/make_cpuid_c.py index 7281f45a3..2be1123a8 100644 --- a/volk/gen/make_cpuid_c.py +++ b/volk/gen/make_cpuid_c.py @@ -39,7 +39,7 @@ struct VOLK_CPU volk_cpu; //implement get cpuid for gcc compilers using a copy of cpuid.h #if defined(__GNUC__) #include <gcc_x86_cpuid.h> -#define cpuid_x86(op, r) __get_cpuid(op, r+0, r+1, r+2, r+3) +#define cpuid_x86(op, r) __get_cpuid(op, (unsigned int *)r+0, (unsigned int *)r+1, (unsigned int *)r+2, (unsigned int *)r+3) //implement get cpuid for MSVC compilers using __cpuid intrinsic #elif defined(_MSC_VER) |