From 7a22068da611235190fa7343ca3f8c1d1944a68c Mon Sep 17 00:00:00 2001
From: Nicolay Korslund <korslund@gmail.com>
Date: Fri, 10 Sep 2010 13:57:35 +0200
Subject: [PATCH] Fixed conflict in last commit

---
 sound/outputs/openal_out.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/outputs/openal_out.cpp b/sound/outputs/openal_out.cpp
index c0cae640e..d0ce47718 100644
--- a/sound/outputs/openal_out.cpp
+++ b/sound/outputs/openal_out.cpp
@@ -55,7 +55,7 @@ static void checkALError(const char *where)
 
 static void getALFormat(SampleSourcePtr inp, int &fmt, int &rate)
 {
-  int32_t rate_, ch, bits;
+  boost::int32_t rate_, ch, bits;
   inp->getInfo(&rate_, &ch, &bits);
   rate = rate_;