summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2006-10-04 10:23:57 (GMT)
committerArmin Rigo <arigo@tunes.org>2006-10-04 10:23:57 (GMT)
commit0d2f498a4cebb428a28fdc54b277ecede5ebc1c7 (patch)
treea6bb0898ce0cf4fdf962e7bcc8681c0bee95266f
parent1c08bb95b77a25f6f5f47da4f9d3622a5dee7639 (diff)
downloadcpython-0d2f498a4cebb428a28fdc54b277ecede5ebc1c7.zip
cpython-0d2f498a4cebb428a28fdc54b277ecede5ebc1c7.tar.gz
cpython-0d2f498a4cebb428a28fdc54b277ecede5ebc1c7.tar.bz2
Compilation problem caused by conflicting typedefs for uint32_t
(unsigned long vs. unsigned int).
-rw-r--r--Modules/linuxaudiodev.c2
-rw-r--r--Modules/ossaudiodev.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c
index c1c7363..b435d76 100644
--- a/Modules/linuxaudiodev.c
+++ b/Modules/linuxaudiodev.c
@@ -28,7 +28,9 @@
#if defined(linux)
#include <linux/soundcard.h>
+#ifndef HAVE_STDINT_H
typedef unsigned long uint32_t;
+#endif
#elif defined(__FreeBSD__)
#include <machine/soundcard.h>
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
index 9716838..eb59c4d 100644
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -34,7 +34,9 @@
#if defined(linux)
+#ifndef HAVE_STDINT_H
typedef unsigned long uint32_t;
+#endif
#elif defined(__FreeBSD__)