From: Armin Rigo <arigo@tunes.org>
Date: Wed, 4 Oct 2006 10:23:57 +0000 (+0000)
Subject: Compilation problem caused by conflicting typedefs for uint32_t
X-Git-Tag: v2.6a1~2604
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d2f498a4cebb428a28fdc54b277ecede5ebc1c7;p=thirdparty%2FPython%2Fcpython.git

Compilation problem caused by conflicting typedefs for uint32_t
(unsigned long vs. unsigned int).
---

diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c
index c1c7363c83b9..b435d768a8ec 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 9716838ba231..eb59c4d8ecf8 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__)