Merge branch 'master' of pixhawk.ethz.ch:groundcontrol

1b380af8 · pixhawk · 60e0f0ff · 889f7af5 · 1b380af8
Commit 1b380af8 authored Apr 10, 2010 by pixhawk
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

GAudioOutput.cc src/GAudioOutput.cc +1 -1

No files found.
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -46,7 +46,7 @@ using System;
 using System.Speech.Synthesis;
 #endif

-#ifndef Q_OS_MAC
+#ifdef Q_OS_LINUX
 extern "C" {
 #include <cmu_us_awb/voxdefs.h>
    //#include <cmu_us_slt/voxdefs.h>