$NetBSD: patch-aa,v 1.3 1998/08/07 10:35:54 agc Exp $ diff -ru ../cam-1.02-virgin/cam.h ./cam.h --- ../cam-1.02-virgin/cam.h Mon Oct 21 13:08:08 1996 +++ ./cam.h Sun Nov 10 12:19:52 1996 @@ -23,7 +23,11 @@ #include #include #include +#ifdef __FreeBSD__ +#include +#else #include +#endif #include #include "sounds.h" Only in .: cam.o Only in .: screens.o diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c --- ../cam-1.02-virgin/sounds.c Mon Oct 21 13:33:55 1996 +++ ./sounds.c Sun Nov 10 12:20:22 1996 @@ -36,7 +36,7 @@ int mixer_fd, recmask, devmask, stereodevs, recsrc; -char *devname[DEV_COUNT] = SOUND_DEVICE_LABELS; +char *cam_devname[DEV_COUNT] = SOUND_DEVICE_LABELS; char *mixer_dev = "/dev/mixer"; struct devices { @@ -287,7 +287,7 @@ else dev_vol[dev_count].vol_right = dev_vol[dev_count].vol_left; - draw_slider( Y, X, devname[dev_nr]); + draw_slider( Y, X, cam_devname[dev_nr]); draw_handle( Y+1, X+14+dev_vol[dev_count].vol_left, FALSE, 4); if (STEREO(dev_nr)) draw_handle( Y+2, X+14+dev_vol[dev_count].vol_right, FALSE, 4); Only in .: sounds.o diff -ru ../cam-1.02-virgin/xcam ./xcam --- ../cam-1.02-virgin/xcam Thu Sep 19 12:10:40 1996 +++ ./xcam Sun Nov 10 12:21:10 1996 @@ -1 +1 @@ -color-xterm -tn xterm-color -font vga -geometry 80x25 -bg black -fg gray -e cam +color_xterm -tn xterm-color -font vga -geometry 80x25 -bg black -fg gray -e ./cam