[xiph-cvs] cvs commit: ao/src/plugins/sun ao_sun.c

[Stan Seibert]

volsung     01/07/22 06:16:14

  Modified:    .        Tag: volsung_20010721 configure.in
               include/ao Tag: volsung_20010721 os_types.h.in
               src/plugins/sun Tag: volsung_20010721 ao_sun.c
  Log:
  Corrections suggested by Ciaran Anscomb <ciarana at rd.bbc.co.uk> to fix my
  stupid typos.  libao should compile on Solaris now.

Revision  Changes    Path
No                   revision

No                   revision

1.21.2.2  +1 -2      ao/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- configure.in	2001/07/22 03:35:40	1.21.2.1
+++ configure.in	2001/07/22 13:16:13	1.21.2.2
@@ -188,5 +188,4 @@
 
 CFLAGS="$CFLAGS -DAO_PLUGIN_PATH=\\\"$plugindir\\\""
 
-AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile)
-dnl AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/arts/Makefile debian/Makefile)
+AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile debian/Makefile)

No                   revision

No                   revision

1.2.4.1   +5 -0      ao/include/ao/os_types.h.in

Index: os_types.h.in
===================================================================
RCS file: /usr/local/cvsroot/ao/include/ao/os_types.h.in,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- os_types.h.in	2000/10/30 00:46:40	1.2
+++ os_types.h.in	2001/07/22 13:16:13	1.2.4.1
@@ -26,9 +26,14 @@
 
 /* Set type sizes for this platform (Requires Autoconf) */
 
+#ifndef __OS_TYPES_H__
+#define __OS_TYPES_H__
+
 typedef unsigned char     uint_8;
 typedef unsigned @SIZE16@ uint_16;
 typedef unsigned @SIZE32@ uint_32;
 typedef signed   char     sint_32;
 typedef signed   @SIZE16@ sint_16;
 typedef signed   @SIZE32@ sint_8;
+
+#endif /* __OS_TYPES_H__ */

No                   revision

No                   revision

1.1.2.2   +3 -3      ao/src/plugins/sun/ao_sun.c

Index: ao_sun.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/sun/ao_sun.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ao_sun.c	2001/07/22 03:35:53	1.1.2.1
+++ ao_sun.c	2001/07/22 13:16:14	1.1.2.2
@@ -47,7 +47,7 @@
 
 static char *ao_sun_options[] = {"dev"};
 ao_info ao_sun_info = {
-	AO_TYPE_LIVE
+	AO_TYPE_LIVE,
         "Sun audio driver output",
         "sun",
         "Christian Weisgerber <naddy at openbsd.org>",
@@ -68,7 +68,7 @@
 {
         int fd;
 
-	if ( (fd = state->fd = open(AO_SUN_DEFAULT_DEV, O_WRONLY)) < 0 )
+	if ( (fd = open(AO_SUN_DEFAULT_DEV, O_WRONLY)) < 0 )
                 return 0; /* Cannot use this plugin with default parameters */
         else {
                 close(fd);
@@ -125,7 +125,7 @@
         
         audio_info_t info;
 
-	if ( (internal->fd = open(state->dev, O_WRONLY)) < 0 )
+	if ( (internal->fd = open(internal->dev, O_WRONLY)) < 0 )
                 return 0;
 
         AUDIO_INITINFO(&info);

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.