summaryrefslogtreecommitdiffstats
path: root/artsc/artsdsp.c
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-05 21:11:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-05 21:11:05 +0000
commit6637c742279c9df570b3bd1d09244f1b0f66ee62 (patch)
tree522e3430dc3b085aad27f9eb6f144977b65a1dd3 /artsc/artsdsp.c
parent7de042bb5beca4107a444f8c60ef24c9735deb65 (diff)
downloadarts-6637c742279c9df570b3bd1d09244f1b0f66ee62.tar.gz
arts-6637c742279c9df570b3bd1d09244f1b0f66ee62.zip
Compilation repairs
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1212131 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'artsc/artsdsp.c')
-rw-r--r--artsc/artsdsp.c6
1 files changed, 4 insertions, 2 deletions
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 <sys/ioctl.h>
#include <sys/stat.h>
/* #include <sys/mman.h> */
+#define open ignore_system_open
#include <fcntl.h>
+#undef open
#include <artsc.h>
#include <dlfcn.h>
@@ -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;