[xiph-commits] r7055 - in icecast/branches/icecast-kh: src win32
oddsock at dactyl.lonelymoon.com
oddsock
Thu Jul 8 13:37:11 PDT 2004
Author: oddsock
Date: Thu Jul 8 13:37:11 2004
New Revision: 7055
Modified:
icecast/branches/icecast-kh/src/auth.c
icecast/branches/icecast-kh/src/auth_cmd.c
icecast/branches/icecast-kh/src/auth_url.c
icecast/branches/icecast-kh/src/client.h
icecast/branches/icecast-kh/src/format.c
icecast/branches/icecast-kh/src/format_vorbis.c
icecast/branches/icecast-kh/win32/icecast.dsp
icecast/branches/icecast-kh/win32/icecast2.iss
Log:
win32 updates
Modified: icecast/branches/icecast-kh/src/auth.c
===================================================================
--- icecast/branches/icecast-kh/src/auth.c 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/src/auth.c 2004-07-08 20:37:07 UTC (rev 7055)
@@ -112,9 +112,14 @@
}
else
#endif
- if(!strcmp(type, "command")) {
+ if(!strcmp(type, "command")) {
+#ifdef WIN32
+ ERROR1("Authenticator type: \"%s\" not supported on win32 platform", type);
+ return NULL;
+#else
auth = auth_get_cmd_auth(options);
- auth->type = strdup(type);
+ auth->type = strdup(type);
+#endif
}
else if(!strcmp(type, "htpasswd")) {
auth = auth_get_htpasswd_auth(options);
Modified: icecast/branches/icecast-kh/src/auth_cmd.c
===================================================================
--- icecast/branches/icecast-kh/src/auth_cmd.c 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/src/auth_cmd.c 2004-07-08 20:37:07 UTC (rev 7055)
@@ -22,7 +22,9 @@
#include <string.h>
#include <errno.h>
#include <stdio.h>
-#include <sys/wait.h>
+#ifndef WIN32
+#include <sys/wait.h>
+#endif
#include "auth.h"
#include "source.h"
Modified: icecast/branches/icecast-kh/src/auth_url.c
===================================================================
--- icecast/branches/icecast-kh/src/auth_url.c 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/src/auth_url.c 2004-07-08 20:37:07 UTC (rev 7055)
@@ -22,7 +22,9 @@
#include <string.h>
#include <errno.h>
#include <stdio.h>
-#include <sys/wait.h>
+#ifndef WIN32
+#include <sys/wait.h>
+#endif
#include <curl/curl.h>
Modified: icecast/branches/icecast-kh/src/client.h
===================================================================
--- icecast/branches/icecast-kh/src/client.h 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/src/client.h 2004-07-08 20:37:07 UTC (rev 7055)
@@ -17,9 +17,11 @@
*/
#ifndef __CLIENT_H__
#define __CLIENT_H__
+
+#ifndef WIN32
+#include <aio.h>
+#endif
-#include <aio.h>
-
#include "connection.h"
#include "refbuf.h"
Modified: icecast/branches/icecast-kh/src/format.c
===================================================================
--- icecast/branches/icecast-kh/src/format.c 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/src/format.c 2004-07-08 20:37:07 UTC (rev 7055)
@@ -44,7 +44,8 @@
#ifdef WIN32
#define strcasecmp stricmp
-#define strncasecmp strnicmp
+#define strncasecmp strnicmp
+#define snprintf _snprintf
#endif
format_type_t format_get_type(char *contenttype)
Modified: icecast/branches/icecast-kh/src/format_vorbis.c
===================================================================
--- icecast/branches/icecast-kh/src/format_vorbis.c 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/src/format_vorbis.c 2004-07-08 20:37:07 UTC (rev 7055)
@@ -792,6 +792,6 @@
void format_ogg_initialise (void)
{
next_rebuild_serialno = 1;
- thread_mutex_create (&serial_lock);
+ thread_mutex_create ("serial", &serial_lock);
}
Modified: icecast/branches/icecast-kh/win32/icecast.dsp
===================================================================
--- icecast/branches/icecast-kh/win32/icecast.dsp 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/win32/icecast.dsp 2004-07-08 20:37:07 UTC (rev 7055)
@@ -101,6 +101,14 @@
# End Source File
# Begin Source File
+SOURCE=..\src\auth_htpasswd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\auth_url.c
+# End Source File
+# Begin Source File
+
SOURCE=..\src\avl\avl.c
# End Source File
# Begin Source File
@@ -161,11 +169,11 @@
# End Source File
# Begin Source File
-SOURCE=..\src\format_vorbis.c
+SOURCE=..\src\format_ogg.c
# End Source File
# Begin Source File
-SOURCE=..\src\format_vorbis.h
+SOURCE=..\src\format_ogg.h
# End Source File
# Begin Source File
@@ -177,14 +185,6 @@
# End Source File
# Begin Source File
-SOURCE=..\src\geturl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\geturl.h
-# End Source File
-# Begin Source File
-
SOURCE=..\src\global.c
# End Source File
# Begin Source File
@@ -321,6 +321,18 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=..\src\auth_cmd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\auth_htpasswd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\auth_url.h
+# End Source File
+# Begin Source File
+
SOURCE=..\src\timing\timing.h
# End Source File
# Begin Source File
Modified: icecast/branches/icecast-kh/win32/icecast2.iss
===================================================================
--- icecast/branches/icecast-kh/win32/icecast2.iss 2004-07-08 17:04:00 UTC (rev 7054)
+++ icecast/branches/icecast-kh/win32/icecast2.iss 2004-07-08 20:37:07 UTC (rev 7055)
@@ -2,8 +2,8 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[Setup]
-AppName=Icecast2 Win32
-AppVerName=Icecast v2.0.0
+AppName=Icecast2 KH47 Win32
+AppVerName=Icecast v2.0.0 KH47
AppPublisherURL=http://www.icecast.org
AppSupportURL=http://www.icecast.org
AppUpdatesURL=http://www.icecast.org
@@ -13,7 +13,7 @@
LicenseFile=..\COPYING
InfoAfterFile=..\README
OutputDir=.
-OutputBaseFilename=icecast2_win32_2.0.0_setup
+OutputBaseFilename=icecast2_win32_2.0.0_KH47_setup
WizardImageFile=icecast2logo2.bmp
; uncomment the following line if you want your installation to run on NT 3.51 too.
; MinVersion=4,3.51
More information about the commits
mailing list