More thread cleanup

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@155 400ebc74-4327-4243-bc38-086b20814532

diff --git a/rtmpsrv.c b/rtmpsrv.c
index 9451373db6a2301f5aefc7769a7c4b34cabd770a..ccb9e2f9e3f607e77f2cae8b5e4e1b4fe83a118a 100644 (file)
--- a/rtmpsrv.c
+++ b/rtmpsrv.c
@@ -530,8 +530,9 @@ quit:
 }
 
 TFTYPE
-serverThread(STREAMING_SERVER * server)
+serverThread(void *arg)
 {
+  STREAMING_SERVER *server = arg;
   server->state = STREAMING_ACCEPTING;
 
   while (server->state == STREAMING_ACCEPTING)
@@ -604,7 +605,7 @@ startStreaming(const char *address, int port)
   server = (STREAMING_SERVER *) calloc(1, sizeof(STREAMING_SERVER));
   server->socket = sockfd;
 
-  ThreadCreate((thrfunc *)serverThread, server);
+  ThreadCreate(serverThread, server);
 
   return server;
 }

diff --git a/rtmpsuck.c b/rtmpsuck.c
index 3b87e3225ef622fca65c4986089d2927d1eecd6f..7aad6f0a13a66a030f9c9c226e2100fd1ab7aab4 100644 (file)
--- a/rtmpsuck.c
+++ b/rtmpsuck.c
@@ -872,8 +872,9 @@ quit:
 }
 
 TFTYPE
-serverThread(STREAMING_SERVER * server)
+serverThread(void *arg)
 {
+  STREAMING_SERVER *server = arg;
   server->state = STREAMING_ACCEPTING;
 
   while (server->state == STREAMING_ACCEPTING)
@@ -950,7 +951,7 @@ startStreaming(const char *address, int port)
   server = (STREAMING_SERVER *) calloc(1, sizeof(STREAMING_SERVER));
   server->socket = sockfd;
 
-  ThreadCreate((thrfunc *)serverThread, server);
+  ThreadCreate(serverThread, server);
 
   return server;
 }

diff --git a/streams.c b/streams.c
index bcff29cede35a6daf5eb556941e2c54bf2ce3f36..1988b962512ce974936b97950ecb68a2a2238a22 100644 (file)
--- a/streams.c
+++ b/streams.c
@@ -761,8 +761,9 @@ filenotfound:
 }
 
 TFTYPE
-serverThread(STREAMING_SERVER * server)
+serverThread(void *arg)
 {
+  STREAMING_SERVER *server = arg;
   server->state = STREAMING_ACCEPTING;
 
   while (server->state == STREAMING_ACCEPTING)
@@ -825,7 +826,7 @@ startStreaming(const char *address, int port)
   server = (STREAMING_SERVER *) calloc(1, sizeof(STREAMING_SERVER));
   server->socket = sockfd;
 
-  ThreadCreate((void *(*)(void *)) serverThread, server);
+  ThreadCreate(serverThread, server);
 
   return server;
 }

diff --git a/thread.h b/thread.h
index f638661a212705cd54634eaa8a1ae663921b5aa1..76d30ee30e6fdfbceca42f01397625fd51ad5b7a 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -22,6 +22,7 @@
 #define __THREAD_H__ 1
 
 #ifdef WIN32
+#include <windows.h>
 #include <process.h>
 #define TFTYPE void
 #define TFRET()