[FFADO-svn] r2088 - in trunk/libffado: src/dice tests

[<tr...@ff...>]

Author: jwoithe
Date: 2012-03-23 04:29:32 -0700 (Fri, 23 Mar 2012)
New Revision: 2088

Modified:
   trunk/libffado/src/dice/dice_firmware_loader.cpp
   trunk/libffado/tests/test-dice-eap.cpp
   trunk/libffado/tests/test-fw410.cpp
   trunk/libffado/tests/test-ieee1394service.cpp
   trunk/libffado/tests/test-ipcringbuffer.cpp
   trunk/libffado/tests/test-messagequeue.cpp
   trunk/libffado/tests/test-scs.cpp
   trunk/libffado/tests/test-shm.cpp
   trunk/libffado/tests/test-streamdump.cpp
Log:
More fixes for compilation under gcc 4.7.  Patch supplied by "oget".  Fixes reopened ticket #344.

Modified: trunk/libffado/src/dice/dice_firmware_loader.cpp
===================================================================
--- trunk/libffado/src/dice/dice_firmware_loader.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/src/dice/dice_firmware_loader.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -44,6 +44,7 @@
 
 #include <string>
 #include <cstring>
+#include <unistd.h>
 #include <assert.h>
 
 #include "libutil/Configuration.h"

Modified: trunk/libffado/tests/test-dice-eap.cpp
===================================================================
--- trunk/libffado/tests/test-dice-eap.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-dice-eap.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -45,6 +45,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <unistd.h>
 
 #include <signal.h>
 int run;

Modified: trunk/libffado/tests/test-fw410.cpp
===================================================================
--- trunk/libffado/tests/test-fw410.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-fw410.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -27,6 +27,7 @@
 #include <argp.h>
 #include <stdlib.h>
 #include <iostream>
+#include <unistd.h>
 
 using namespace std;
 

Modified: trunk/libffado/tests/test-ieee1394service.cpp
===================================================================
--- trunk/libffado/tests/test-ieee1394service.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-ieee1394service.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <endian.h>
+#include <unistd.h>
 
 #include <getopt.h>
 

Modified: trunk/libffado/tests/test-ipcringbuffer.cpp
===================================================================
--- trunk/libffado/tests/test-ipcringbuffer.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-ipcringbuffer.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <signal.h>
+#include <unistd.h>
 
 using namespace Util;
 

Modified: trunk/libffado/tests/test-messagequeue.cpp
===================================================================
--- trunk/libffado/tests/test-messagequeue.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-messagequeue.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <signal.h>
+#include <unistd.h>
 
 #include <semaphore.h>
 #include <cstring>

Modified: trunk/libffado/tests/test-scs.cpp
===================================================================
--- trunk/libffado/tests/test-scs.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-scs.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -477,8 +477,8 @@
         }
         #endif
 
-        BridgeMapIterator it = seqport2bridgemap.find(portNumber);
-        if(it == seqport2bridgemap.end()) {
+        BridgeMapIterator it2 = seqport2bridgemap.find(portNumber);
+        if(it2 == seqport2bridgemap.end()) {
             seqport2bridgemap[portNumber] = bridge;
         } else {
             debugError("BUG: port already present in bridge map, duplicate port.\n");

Modified: trunk/libffado/tests/test-shm.cpp
===================================================================
--- trunk/libffado/tests/test-shm.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-shm.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <signal.h>
+#include <unistd.h>
 
 using namespace Util;
 

Modified: trunk/libffado/tests/test-streamdump.cpp
===================================================================
--- trunk/libffado/tests/test-streamdump.cpp	2012-03-19 22:50:49 UTC (rev 2087)
+++ trunk/libffado/tests/test-streamdump.cpp	2012-03-23 11:29:32 UTC (rev 2088)
@@ -27,6 +27,7 @@
 
 #include <argp.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <iostream>
 
 using namespace std;