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.4.4c1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baab23ec364e8a850db931a2bfef31c3b9c9a5ae;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 7718c3be2c1d..f1b069d7d061 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 35e67635bc61..e4a8958cc27e 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__)