Applied in the master branch.

----- Original Message -----
From: "Marat Radchenko" <[email protected]>
To: [email protected]
Sent: Wednesday, December 15, 2010 1:42:45 AM
Subject: [SFLphone] [PATCH] Fixed building of sflphone-common on Maemo5

1. echocancel.cpp was missing #include <cmath>
2. astyle search was using find -exec (replaced with xargs)
---
 sflphone-common/globals.mak              |    2 +-
 sflphone-common/src/audio/echocancel.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak
index 16656d1..b42dc71 100644
--- a/sflphone-common/globals.mak
+++ b/sflphone-common/globals.mak
@@ -74,5 +74,5 @@ AM_CPPFLAGS = \
 indent:
        @echo "Indenting code:"
        if [ -f $(ASTYLERC) ] ; then \
-               find $(top_srcdir)/src/ -regex ".*\.\(h\|cpp\)" -exec $(indent) 
--options=$(ASTYLERC) {} \; ; \
+               find $(top_srcdir)/src/ -name \*.cpp -o -name \*.h | xargs 
$(indent) --options=$(ASTYLERC) ; \
        fi
diff --git a/sflphone-common/src/audio/echocancel.cpp 
b/sflphone-common/src/audio/echocancel.cpp
index 9c18bc4..320620b 100644
--- a/sflphone-common/src/audio/echocancel.cpp
+++ b/sflphone-common/src/audio/echocancel.cpp
@@ -30,7 +30,7 @@
 
 #include "echocancel.h"
 
-// #include <fstream>
+#include <cmath>
 
 EchoCancel::EchoCancel (int smplRate, int frameLength) : _samplingRate 
(smplRate),
     _frameLength (frameLength),
-- 
1.6.6

_______________________________________________
SFLphone mailing list
[email protected]
http://lists.savoirfairelinux.net/mailman/listinfo/sflphone
_______________________________________________
SFLphone mailing list
[email protected]
http://lists.savoirfairelinux.net/mailman/listinfo/sflphone

Reply via email to