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

[Karl Heyes]

karl        03/03/27 19:45:55

  Modified:    src      ices.c stream.c
  Log:
  Use the package string from autotools for usage and shout HTTP headers

Revision  Changes    Path
1.9       +4 -4      ices/src/ices.c

Index: ices.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/ices.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ices.c	22 Mar 2003 02:27:55 -0000	1.8
+++ ices.c	28 Mar 2003 00:45:54 -0000	1.9
@@ -1,7 +1,7 @@
 /* ices.c
  * - Main startup, thread launching, and cleanup code.
  *
- * $Id: ices.c,v 1.8 2003/03/22 02:27:55 karl Exp $
+ * $Id: ices.c,v 1.9 2003/03/28 00:45:54 karl Exp $
  *
  * Copyright (c) 2001-2002 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -20,8 +20,8 @@
 #include <unistd.h>
 
 
-#include "resolver.h"
-#include "thread.h"
+#include <net/resolver.h>
+#include <thread/thread.h>
 
 #include "cfgparse.h"
 #include "stream.h"
@@ -38,7 +38,7 @@
 
     if (argc != 2) 
     {
-        fprintf(stderr, VERSIONSTRING "\n"
+        fprintf(stderr, PACKAGE_STRING "\n"
                 "  (c) Copyright 2001-2002 Michael Smith <msmith at icecast.org>\n"
                 "\n"
                 "Usage: \"ices config.xml\"\n");

<p><p>1.28      +2 -2      ices/src/stream.c

Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- stream.c	22 Mar 2003 02:27:55 -0000	1.27
+++ stream.c	28 Mar 2003 00:45:54 -0000	1.28
@@ -1,7 +1,7 @@
 /* stream.c
  * - Core streaming functions/main loop.
  *
- * $Id: stream.c,v 1.27 2003/03/22 02:27:55 karl Exp $
+ * $Id: stream.c,v 1.28 2003/03/28 00:45:54 karl Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -95,7 +95,7 @@
         return NULL;
     }
 
-    if (!(shout_set_agent(sdsc->shout, VERSIONSTRING)) == SHOUTERR_SUCCESS) {
+    if (!(shout_set_agent(sdsc->shout, PACKAGE_STRING)) == SHOUTERR_SUCCESS) {
         LOG_ERROR1("libshout error: %s\n", shout_get_error(sdsc->shout));
         stream->died = 1;
         return NULL;

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