[Python-checkins] r52137 - in python: branches/release24-maint/Modules/linuxaudiodev.c branches/release24-maint/Modules/ossaudiodev.c branches/release25-maint/Modules/linuxaudiodev.c branches/release25-maint/Modules/ossaudiodev.c trunk/Modules/linuxaudiodev.c trunk/Modules/ossaudiodev.c

[armin.rigo]

Author: armin.rigo
Date: Wed Oct  4 12:23:57 2006
New Revision: 52137

Modified:
   python/branches/release24-maint/Modules/linuxaudiodev.c
   python/branches/release24-maint/Modules/ossaudiodev.c
   python/branches/release25-maint/Modules/linuxaudiodev.c
   python/branches/release25-maint/Modules/ossaudiodev.c
   python/trunk/Modules/linuxaudiodev.c
   python/trunk/Modules/ossaudiodev.c
Log:
Compilation problem caused by conflicting typedefs for uint32_t
(unsigned long vs. unsigned int).


Modified: python/branches/release24-maint/Modules/linuxaudiodev.c
==============================================================================
--- python/branches/release24-maint/Modules/linuxaudiodev.c	(original)
+++ python/branches/release24-maint/Modules/linuxaudiodev.c	Wed Oct  4 12:23:57 2006
@@ -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>

Modified: python/branches/release24-maint/Modules/ossaudiodev.c
==============================================================================
--- python/branches/release24-maint/Modules/ossaudiodev.c	(original)
+++ python/branches/release24-maint/Modules/ossaudiodev.c	Wed Oct  4 12:23:57 2006
@@ -34,7 +34,9 @@
 
 #if defined(linux)
 
+#ifndef HAVE_STDINT_H
 typedef unsigned long uint32_t;
+#endif
 
 #elif defined(__FreeBSD__)
 

Modified: python/branches/release25-maint/Modules/linuxaudiodev.c
==============================================================================
--- python/branches/release25-maint/Modules/linuxaudiodev.c	(original)
+++ python/branches/release25-maint/Modules/linuxaudiodev.c	Wed Oct  4 12:23:57 2006
@@ -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>

Modified: python/branches/release25-maint/Modules/ossaudiodev.c
==============================================================================
--- python/branches/release25-maint/Modules/ossaudiodev.c	(original)
+++ python/branches/release25-maint/Modules/ossaudiodev.c	Wed Oct  4 12:23:57 2006
@@ -34,7 +34,9 @@
 
 #if defined(linux)
 
+#ifndef HAVE_STDINT_H
 typedef unsigned long uint32_t;
+#endif
 
 #elif defined(__FreeBSD__)
 

Modified: python/trunk/Modules/linuxaudiodev.c
==============================================================================
--- python/trunk/Modules/linuxaudiodev.c	(original)
+++ python/trunk/Modules/linuxaudiodev.c	Wed Oct  4 12:23:57 2006
@@ -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>

Modified: python/trunk/Modules/ossaudiodev.c
==============================================================================
--- python/trunk/Modules/ossaudiodev.c	(original)
+++ python/trunk/Modules/ossaudiodev.c	Wed Oct  4 12:23:57 2006
@@ -34,7 +34,9 @@
 
 #if defined(linux)
 
+#ifndef HAVE_STDINT_H
 typedef unsigned long uint32_t;
+#endif
 
 #elif defined(__FreeBSD__)