11 files changed, 66 insertions, 7 deletions
diff --git a/regress/lib/libsndio/cap/Makefile b/regress/lib/libsndio/cap/Makefile
index 141d859367b..dfa92152e82 100644
--- a/regress/lib/libsndio/cap/Makefile
+++ b/regress/lib/libsndio/cap/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2008/10/27 00:26:33 ratchov Exp $
+#	$OpenBSD: Makefile,v 1.2 2011/04/12 07:12:59 ratchov Exp $
 PROG= cap
 LDADD= -lsndio
+CFLAGS+= -I${.CURDIR}/..
 REGRESS_SKIP=
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libsndio/cap/cap.c b/regress/lib/libsndio/cap/cap.c
index 3933bcd4da7..ce771a09ba6 100644
--- a/regress/lib/libsndio/cap/cap.c
+++ b/regress/lib/libsndio/cap/cap.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sndio.h>
+#include "tools.h"
 
 struct sio_par par;
 struct sio_cap cap;
diff --git a/regress/lib/libsndio/fd/Makefile b/regress/lib/libsndio/fd/Makefile
index ca36f9006ea..5127590e232 100644
--- a/regress/lib/libsndio/fd/Makefile
+++ b/regress/lib/libsndio/fd/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2010/11/06 20:25:42 ratchov Exp $
+#	$OpenBSD: Makefile,v 1.3 2011/04/12 07:12:59 ratchov Exp $
 PROG= fd
 LDADD= -lsndio
+CFLAGS+= -I${.CURDIR}/..
 SRCS = fd.c tools.c
 REGRESS_SKIP=
 .PATH: ${.CURDIR}/..
diff --git a/regress/lib/libsndio/fd/fd.c b/regress/lib/libsndio/fd/fd.c
index d25f32acdc2..5de203fe730 100644
--- a/regress/lib/libsndio/fd/fd.c
+++ b/regress/lib/libsndio/fd/fd.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sndio.h>
+#include "tools.h"
 
 struct buf {				/* simple circular fifo */
 	unsigned start;			/* first used byte */
diff --git a/regress/lib/libsndio/play/Makefile b/regress/lib/libsndio/play/Makefile
index 3ea4d99d94b..09d7459f634 100644
--- a/regress/lib/libsndio/play/Makefile
+++ b/regress/lib/libsndio/play/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2010/11/06 20:25:42 ratchov Exp $
+#	$OpenBSD: Makefile,v 1.3 2011/04/12 07:12:59 ratchov Exp $
 PROG= play
 LDADD= -lsndio
+CFLAGS+= -I${.CURDIR}/..
 SRCS = play.c tools.c
 REGRESS_SKIP=
 .PATH: ${.CURDIR}/..
diff --git a/regress/lib/libsndio/play/play.c b/regress/lib/libsndio/play/play.c
index 6d85508da42..8785117ff96 100644
--- a/regress/lib/libsndio/play/play.c
+++ b/regress/lib/libsndio/play/play.c
@@ -5,7 +5,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "sndio.h"
+#include <sndio.h>
+#include "tools.h"
 
 #define BUFSZ 0x100
 unsigned char buf[BUFSZ];
diff --git a/regress/lib/libsndio/rec/Makefile b/regress/lib/libsndio/rec/Makefile
index 2a5738e024e..16db5b4008a 100644
--- a/regress/lib/libsndio/rec/Makefile
+++ b/regress/lib/libsndio/rec/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2010/11/06 20:25:42 ratchov Exp $
+#	$OpenBSD: Makefile,v 1.3 2011/04/12 07:12:59 ratchov Exp $
 PROG= rec
 LDADD= -lsndio
+CFLAGS+= -I${.CURDIR}/..
 SRCS = rec.c tools.c
 REGRESS_SKIP=
 .PATH: ${.CURDIR}/..
diff --git a/regress/lib/libsndio/rec/rec.c b/regress/lib/libsndio/rec/rec.c
index f5c908077dc..862dc47f005 100644
--- a/regress/lib/libsndio/rec/rec.c
+++ b/regress/lib/libsndio/rec/rec.c
@@ -5,7 +5,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "sndio.h"
+#include <sndio.h>
+#include "tools.h"
 
 #define BUFSZ 0x1000
 unsigned char buf[BUFSZ];
diff --git a/regress/lib/libsndio/tools.h b/regress/lib/libsndio/tools.h
new file mode 100644
index 00000000000..c87247dd88e
--- /dev/null
+++ b/regress/lib/libsndio/tools.h
@@ -0,0 +1,49 @@
+/*	$OpenBSD: tools.h,v 1.1 2011/04/12 07:12:59 ratchov Exp $	*/
+/*
+ * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef TOOLS_H
+#define TOOLS_H
+
+/*
+ * maximum size of the encording string (the longest possible
+ * encoding is ``s24le3msb'')
+ */
+#define SIO_ENCMAX	10
+
+/*
+ * default device for the sun audio(4) back-end
+ */
+#define SIO_SUN_PATH	"/dev/audio"
+
+/*
+ * default socket name for the aucat(1) back-end
+ */
+#define SIO_AUCAT_PATH	"default"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct sio_par;
+
+int sio_strtoenc(struct sio_par *, char *);
+int sio_enctostr(struct sio_par *, char *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined(TOOLS_H) */
diff --git a/regress/lib/libsndio/vol/Makefile b/regress/lib/libsndio/vol/Makefile
index 06bd08fd561..596b1a96d49 100644
--- a/regress/lib/libsndio/vol/Makefile
+++ b/regress/lib/libsndio/vol/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2010/11/06 20:25:42 ratchov Exp $
+#	$OpenBSD: Makefile,v 1.3 2011/04/12 07:12:59 ratchov Exp $
 PROG= vol
 LDADD= -lsndio
+CFLAGS+= -I${.CURDIR}/..
 SRCS = vol.c tools.c
 REGRESS_SKIP=
 .PATH: ${.CURDIR}/..
diff --git a/regress/lib/libsndio/vol/vol.c b/regress/lib/libsndio/vol/vol.c
index 8173af547b6..46c162e0014 100644
--- a/regress/lib/libsndio/vol/vol.c
+++ b/regress/lib/libsndio/vol/vol.c
@@ -8,6 +8,7 @@
 #include <poll.h>
 #include <termios.h>
 #include <sndio.h>
+#include "tools.h"
 
 #define BUFSZ 0x100
 unsigned char buf[BUFSZ];