[xiph-cvs] cvs commit: ices/src im_sun.h im_sun.c

[Karl Heyes]

karl        03/07/01 19:53:06

  Modified:    src      im_sun.h im_sun.c
  Log:
  fix compile failure on solaris, name clash

Revision  Changes    Path
1.4       +2 -2      ices/src/im_sun.h

Index: im_sun.h
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_sun.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im_sun.h	16 Mar 2003 14:21:48 -0000	1.3
+++ im_sun.h	1 Jul 2003 23:53:06 -0000	1.4
@@ -1,7 +1,7 @@
 /* im_sun.h
  * - read pcm data from sun devices
  *
- * $Id: im_sun.h,v 1.3 2003/03/16 14:21:48 msmith Exp $
+ * $Id: im_sun.h,v 1.4 2003/07/01 23:53:06 karl Exp $
  *
  * by Ciaran Anscomb <ciarana at rd.bbc.co.uk>, based
  * on im_oss.c which is...
@@ -18,7 +18,7 @@
 
 #include <sys/audioio.h>
 #include "inputmodule.h"
-#include "thread.h"
+#include "thread/thread.h"
 #include <ogg/ogg.h>
 
 typedef struct

<p><p>1.11      +1 -3      ices/src/im_sun.c

Index: im_sun.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_sun.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- im_sun.c	22 Mar 2003 02:27:55 -0000	1.10
+++ im_sun.c	1 Jul 2003 23:53:06 -0000	1.11
@@ -1,7 +1,7 @@
 /* im_sun.c
  * - Raw PCM input from Solaris audio devices
  *
- * $Id: im_sun.c,v 1.10 2003/03/22 02:27:55 karl Exp $
+ * $Id: im_sun.c,v 1.11 2003/07/01 23:53:06 karl Exp $
  *
  * by Ciaran Anscomb <ciarana at rd.bbc.co.uk>, based
  * on im_oss.c which is...
@@ -29,8 +29,6 @@
 #include <stropts.h>
 #include <fcntl.h>
 
-
-#include "thread.h"
 #include "cfgparse.h"
 #include "stream.h"
 #include "inputmodule.h"

<p><p>--- >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.