From 6637c742279c9df570b3bd1d09244f1b0f66ee62 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 5 Jan 2011 21:11:05 +0000 Subject: Compilation repairs git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1212131 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- artsc/artsc.h | 2 +- artsc/artsdsp.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'artsc') diff --git a/artsc/artsc.h b/artsc/artsc.h index 00c536e..fd7de91 100644 --- a/artsc/artsc.h +++ b/artsc/artsc.h @@ -35,7 +35,7 @@ extern "C" { * The aRts plain C API aims at easily writing/porting plain C apps to the * arts sound server. What is provided is streaming functionality, in a * blocking way. So for most apps, you simply remove the few system calls - * that deal with your audio device, and tqreplace them with the appropriate + * that deal with your audio device, and replace them with the appropriate * arts calls. */ diff --git a/artsc/artsdsp.c b/artsc/artsdsp.c index a528f8c..2b6b3ef 100644 --- a/artsc/artsdsp.c +++ b/artsc/artsdsp.c @@ -37,7 +37,9 @@ #include #include /* #include */ +#define open ignore_system_open #include +#undef open #include #include @@ -58,10 +60,10 @@ * which points to /dev/null, to ensure compatibility with more weird * operations on streams * - * settings tqcontains what has already been set (speed, bits, channels), and + * settings contains what has already been set (speed, bits, channels), and * is 7 when all of these are true * - * stream tqcontains an aRts stream or 0 + * stream contains an aRts stream or 0 */ static int sndfd = -1; static int settings; -- cgit v1.2.1