From 612ab7b1ff2aec0ce27d2bd8b43e61a2f14774b5 Mon Sep 17 00:00:00 2001
From: darkeye <darkeye@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Sat, 23 Dec 2006 16:52:05 +0000
Subject: [PATCH] fix to enable compiling on 64 bit archs, closes #1

---
 darkice/trunk/AUTHORS                | 1 +
 darkice/trunk/ChangeLog              | 5 +++++
 darkice/trunk/man/darkice.1          | 1 +
 darkice/trunk/src/LameLibEncoder.cpp | 6 ++++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/darkice/trunk/AUTHORS b/darkice/trunk/AUTHORS
index 09cc55d..1be49c0 100644
--- a/darkice/trunk/AUTHORS
+++ b/darkice/trunk/AUTHORS
@@ -25,4 +25,5 @@ with contributions by:
     Nicholas J. Humfrey <njh@ecs.soton.ac.uk>
     Joel Ebel <jbebel@ncsu.edu>
     <jochen2@users.sourceforge.net>
+	Alexander Vlasov <zulu@galaradio.com>
 
diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog
index 417d00e..c2e9fdb 100644
--- a/darkice/trunk/ChangeLog
+++ b/darkice/trunk/ChangeLog
@@ -1,3 +1,8 @@
+DarkIce next release
+
+	o fix to enable compiling on 64 bit platforms
+	  thanks to Alexander Vlasov <zulu@galaradio.com>
+
 19-05-2006 DarkIce 0.17.1 released
 
     o bugfix: automatic reconnect works more reliably
diff --git a/darkice/trunk/man/darkice.1 b/darkice/trunk/man/darkice.1
index 7f6162a..003534a 100644
--- a/darkice/trunk/man/darkice.1
+++ b/darkice/trunk/man/darkice.1
@@ -98,6 +98,7 @@ Developed with contributions by
     Nicholas J. Humfrey <njh@ecs.soton.ac.uk>
     Joel Ebel <jbebel@ncsu.edu>
     <jochen2@users.sourceforge.net>
+	Alexander Vlasov <zulu@galaradio.com>
 
 .SH LINKS
 Project homepage:
diff --git a/darkice/trunk/src/LameLibEncoder.cpp b/darkice/trunk/src/LameLibEncoder.cpp
index 4752f12..e294c25 100644
--- a/darkice/trunk/src/LameLibEncoder.cpp
+++ b/darkice/trunk/src/LameLibEncoder.cpp
@@ -79,10 +79,12 @@ LameLibEncoder :: open ( void )
     lameGlobalFlags = lame_init();
 
     // ugly lame returns -1 in a pointer on allocation errors
-    if ( !lameGlobalFlags || ((int)lameGlobalFlags) == -1 ) {
+    // this is cast to (long int) so that the pointer can be handled
+    // on 64 bit systems as well
+    if ( !lameGlobalFlags || ((long int)lameGlobalFlags) == -1 ) {
         throw Exception( __FILE__, __LINE__,
                          "lame lib init error",
-                         (int) lameGlobalFlags);
+                         (long int) lameGlobalFlags);
     }
 
     if ( 0 > lame_set_num_channels( lameGlobalFlags, getInChannel()) ) {