[Liboss-commit] CVS: liboss/src Makefile.am,1.4,1.5 osscat.c,1.13,1.14

[Alexander S. <mrv...@us...>]

Update of /cvsroot/liboss/liboss/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31358/src

Modified Files:
	Makefile.am osscat.c 
Log Message:
Builds on FreeBSD 4.7

Index: Makefile.am
===================================================================
RCS file: /cvsroot/liboss/liboss/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	6 Jan 2003 21:52:57 -0000	1.4
+++ Makefile.am	22 Feb 2003 03:02:38 -0000	1.5
@@ -2,7 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-AM_CFLAGS = @NONPIC_CFLAGS@ @CLIENT_CFLAGS@
+AM_CFLAGS = $(NONPIC_CFLAGS) $(INTERNAL_CLIENT_CFLAGS)
 
 bin_PROGRAMS = osscat
 

Index: osscat.c
===================================================================
RCS file: /cvsroot/liboss/liboss/src/osscat.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- osscat.c	6 Nov 2002 21:03:32 -0000	1.13
+++ osscat.c	22 Feb 2003 03:02:38 -0000	1.14
@@ -26,7 +26,7 @@
 int main(int argc, char **argv)
 {
 	int retval = 0, arg = 0;
-	int play, sz;                        
+	int play, sz, format;                        
 
 	int stereo = STEREO, speed = RATE;
 	int bits = BITS;
@@ -74,7 +74,7 @@
 		exit(1);
 	}
 
-	int format = (bits == 16) ? AFMT_S16_NE : AFMT_S8;
+        format = (bits == 16) ? AFMT_S16_NE : AFMT_S8;
 	retval = ioctl(play, SNDCTL_DSP_SETFMT, &format);
 	if (retval < 0)
 		return retval;