MinGW portability fixes

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

diff --git a/rtmp.c b/rtmp.c
index 2630b31b678b9615a3aab9b80cf1c084dd382d55..633257681b6d5aac7cf7b145ba6d7f0aa04240a3 100644 (file)
--- a/rtmp.c
+++ b/rtmp.c
@@ -25,17 +25,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
 #include <assert.h>
 
 #ifdef WIN32
 #include <winsock.h>
 #define close(x)       closesocket(x)
+#define setsockopt(a,b,c,d,e)  (setsockopt)(a,b,c,(const char *)d,(int)e)
 #else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <sys/times.h>
 #endif
 

diff --git a/rtmpdump.c b/rtmpdump.c
index 0e6e8fb1911ae42d301ed1cd74d5c46e6ff2c016..f35fc2236d67373a03e656195b4d7d7ae14b34e3 100644 (file)
--- a/rtmpdump.c
+++ b/rtmpdump.c
@@ -97,11 +97,13 @@ sigIntHandler(int sig)
   bCtrlC = true;
   LogPrintf("Caught signal: %d, cleaning up, just a second...\n", sig);
   // ignore all these signals now and let the connection close
-  signal(SIGHUP, SIG_IGN);
   signal(SIGINT, SIG_IGN);
-  signal(SIGPIPE, SIG_IGN);
   signal(SIGTERM, SIG_IGN);
+#ifndef WIN32
+  signal(SIGHUP, SIG_IGN);
+  signal(SIGPIPE, SIG_IGN);
   signal(SIGQUIT, SIG_IGN);
+#endif
 }
 
 int
@@ -1100,13 +1102,22 @@ main(int argc, char **argv)
 
   char *flvFile = 0;
 
-  char DEFAULT_FLASH_VER[] = "LNX 10,0,22,87";
+#undef OSS
+#ifdef WIN32
+#define        OSS     "WIN"
+#else
+#define OSS    "LNX"
+#endif
+
+  char DEFAULT_FLASH_VER[] = OSS " 10,0,22,87";
 
-  signal(SIGHUP, sigIntHandler);
   signal(SIGINT, sigIntHandler);
-  signal(SIGPIPE, sigIntHandler);
   signal(SIGTERM, sigIntHandler);
+#ifndef WIN32
+  signal(SIGHUP, sigIntHandler);
+  signal(SIGPIPE, sigIntHandler);
   signal(SIGQUIT, sigIntHandler);
+#endif
 
   /* sleep(30); */