WIN32: Disable some fatal compiler warnings. TODO: Fix for real sometime.

diff --git a/boxx.cc b/boxx.cc
index 278747aeed2f66da6d78117facad6265d585d050..73e81716b7b25425a891d508896e8222b58d49b3 100644 (file)
--- a/boxx.cc
+++ b/boxx.cc
@@ -294,6 +294,11 @@ int Boxx::drawPara(const char* text, int x, int y, const DrawStyle& colour,unsig
   int printLine;
   int leftlines=0;
 
+#if WIN32
+  // FIXME win pragma
+#pragma warning(disable : 4146)
+#endif
+
   int drawLinePos=-skiplines;
 
   textPos = 0;

diff --git a/dvbsubtitles.cc b/dvbsubtitles.cc
index 5351b6f5706aa5c84c912649806bf3183feb694a..ff8e4cb2d6940b591248fbc0aad6a464817473cc 100644 (file)
--- a/dvbsubtitles.cc
+++ b/dvbsubtitles.cc
@@ -935,6 +935,11 @@ void DVBSubtitles::nudge()
 #define SUBTITLE_TIMEOUT_MS 750 
 // How often do we check if subtitles have been timed out.
 
+#if WIN32
+// FIXME win pragma
+#pragma warning(disable : 4146)
+#endif
+
 void DVBSubtitles::threadMethod()
 {
   struct timespec sleeptime;

diff --git a/osdvector.cc b/osdvector.cc
index aab8b1757a27a6c641936b827e088cc54b5284a4..0ecc7e1cf8536a4d1ab629fa3ceafcf4c298a4be 100644 (file)
--- a/osdvector.cc
+++ b/osdvector.cc
@@ -883,6 +883,11 @@ void OsdVector::PictureReader::addStaticImage(unsigned int id)
        threadSignal();
 }
 
+#if WIN32
+// FIXME win pragma
+#pragma warning(disable : 4703)
+#endif
+
 bool OsdVector::PictureReader::processReceivedPictures()
 {
        bool decoded = false;

diff --git a/surfacewin.cc b/surfacewin.cc
index 302f35c7d32c27560c000896d0d71f75587de6ec..da1d323e470f6524f5afd2b79bc0e89ef21ce3fa 100644 (file)
--- a/surfacewin.cc
+++ b/surfacewin.cc
@@ -185,6 +185,11 @@ void SurfaceWin::drawPixel(int x, int y, Colour & colour, bool fastdraw) {
     drawPixel(x, y, c, fastdraw);
   }
 
+#if WIN32
+// FIXME win pragma
+#pragma warning(disable : 4703)
+#endif
+
 void SurfaceWin::drawPixel(int x, int y, unsigned int c, bool fastdraw)
 {
   //FixMe: locking for every single Pixel will be painfully slow

diff --git a/tcp.cc b/tcp.cc
index 19bfc37c44b4674dd81f55e5facecc6c6eae45c4..5aff9cfaca471c0a26b8167959b76abd3e59175d 100644 (file)
--- a/tcp.cc
+++ b/tcp.cc
@@ -115,8 +115,11 @@ void TCP::getMAC(char* dest)
 
 int TCP::connectTo(char* host, unsigned short port)
 {
+#ifdef VOMP_PLATTFORM_RASPBERRY
 #define IPV 6
-
+#else
+#define IPV 4
+#endif
 
 #if IPV == 4
 

diff --git a/teletextdecodervbiebu.cc b/teletextdecodervbiebu.cc
index 0ea194f976475ace43d042973aa40482ab3ec3ab..d52d3df186d81360b81b84fb1d31848d4f696a5d 100644 (file)
--- a/teletextdecodervbiebu.cc
+++ b/teletextdecodervbiebu.cc
@@ -152,6 +152,11 @@ void TeletextDecoderVBIEBU::PrepareMediaSample(const MediaPacketList& mplist, UI
     mediapacket = mplist.front();
 }
 
+#if WIN32
+// FIXME win pragma
+#pragma warning(disable : 4146)
+#endif
+
 static ULLONG TxtPTSDifference(ULLONG pts1, ULLONG pts2)
 {
   // Assume pts1, pts2 < 2^33; calculate pts1 - pts2

diff --git a/vepglistadvanced.cc b/vepglistadvanced.cc
index 42450f8771c5b7189c0af9260f6dbe4bbd738b31..360798e2c740875a0a4202c0c061597e523347e8 100644 (file)
--- a/vepglistadvanced.cc
+++ b/vepglistadvanced.cc
@@ -275,6 +275,11 @@ void VEpgListAdvanced::doSwitch()
        }
 }
 
+#if WIN32
+// FIXME win pragma
+#pragma warning(disable : 4703)
+#endif
+
 void VEpgListAdvanced::doRecord()
 {
        int channel;

diff --git a/videowin.cc b/videowin.cc
index 93637c30f90f1829221ea944e4b81902731e47d3..2e73b7ebb2b83802727dc0934ee9c985cb3794ae 100644 (file)
--- a/videowin.cc
+++ b/videowin.cc
@@ -80,6 +80,11 @@ VideoWin::VideoWin()
   videoH264filterselected=-1;
   OSVERSIONINFO verinfo;
   verinfo.dwOSVersionInfoSize=sizeof(verinfo);
+
+#if WIN32
+  // FIXME win pragma
+#pragma warning(disable : 4996)
+#endif
   GetVersionEx(&verinfo);
 
   if (verinfo.dwMajorVersion>=6) {

diff --git a/windowsosd.cc b/windowsosd.cc
index e01668f9d5de5fba33c72926d92fa413e26556ff..199286d250e299830b7562c034c6cc0aab350754 100644 (file)
--- a/windowsosd.cc
+++ b/windowsosd.cc
@@ -227,6 +227,11 @@ void WindowsOsd::shutdownDirect3D9Objects()
        if (swappy) swappy->Release();
 }
 
+#if WIN32
+// FIXME win pragma
+#pragma warning(disable : 4703)
+#endif
+
 void WindowsOsd::threadMethod()
 {
        while (true)