Portability

diff --git a/defines.h b/defines.h
index 8c3b1eee22d378c98d545d676400ed7fa47e182f..f95d2862200f33e6904b839f5cbc90da0134cb80 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -43,6 +43,7 @@ void MILLISLEEP(ULONG a);
   #define STRCASECMP stricmp
   #define STRCASESTR StrStrI
   #define STRTOULL _strtoui64
+  #define CLOSESOCKET closesocket
 
 #else
 
@@ -53,6 +54,7 @@ void MILLISLEEP(ULONG a);
   #define STRCASECMP strcasecmp
   #define STRCASESTR strcasestr
   #define STRTOULL strtoull
+  #define CLOSESOCKET close
 
 #endif
 

diff --git a/dsock.cc b/dsock.cc
index 4acc89f4202fe0177c5a4be4d2d206f5d15dab63..2e84bd5b36b746d8ddd70a6b23b4a81cb9daded1 100644 (file)
--- a/dsock.cc
+++ b/dsock.cc
@@ -48,7 +48,7 @@ DatagramSocket::DatagramSocket(short port)
 
 DatagramSocket::~DatagramSocket()
 {
-  close(socketnum);
+  CLOSESOCKET(socketnum);
 }
 
 DatagramSocket* DatagramSocket::theInstance = 0;
@@ -133,9 +133,9 @@ void DatagramSocket::send(char *ipa, short port, char *message, int length)
   {
     printf("%s:%i\tOUT %i\t", ipa, port, length);
     int k;
-    uchar l;
+    UCHAR l;
     for (k = 0; k < length; k++)
-      { l = (uchar)message[k]; printf("%u ", l); }
+      { l = (UCHAR)message[k]; printf("%u ", l); }
   }
 
   int sentLength = 0;

diff --git a/dsock.h b/dsock.h
index 110c31ada2adb7936fc38ac34766c0acf9edb337..d23fc2f45e0746e75e4b842250844595521e8b2b 100644 (file)
--- a/dsock.h
+++ b/dsock.h
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include "defines.h"
 
 #define MAXBUFLEN 2000
-typedef unsigned char uchar;
 
 class DatagramSocket
 {

diff --git a/main.cc b/main.cc
index 53c629bda21703ae607763b23cc00207515c8018..e5c9ae72637131890566bff61e30fdc82d915433 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -22,8 +22,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#ifndef WIN32
 #include <unistd.h>
 #include <endian.h>
+#endif
 
 #include "defines.h"
 #include "log.h"

diff --git a/tcp.cc b/tcp.cc
index 6f68d4f16e92d6b5d8fdca9d403bc05d35c83725..7ed022295163460274c3a536fc699516f7c7beac 100644 (file)
--- a/tcp.cc
+++ b/tcp.cc
@@ -32,7 +32,7 @@ TCP::~TCP()
 {
   if (connected)
   {
-    close(sock);
+    CLOSESOCKET(sock);
     Log::getInstance()->log("TCP", Log::DEBUG, "Have closed");
   }
 }
@@ -104,7 +104,7 @@ int TCP::connectTo(char* host, unsigned short port)
   if (success < 1)
   {
     // timeout or error
-    close(sock);
+    CLOSESOCKET(sock);
     return 0;
   }
 
@@ -123,7 +123,7 @@ int TCP::connectTo(char* host, unsigned short port)
   }
   else
   {
-    close(sock);
+    CLOSESOCKET(sock);
     return 0;
   }
 

diff --git a/wjpeg.cc b/wjpeg.cc
index fb64a6aacb255eb85886356203aa669d78f05b9d..361a489c539551a8ffc53b6b2a7e0c377840ad24 100644 (file)
--- a/wjpeg.cc
+++ b/wjpeg.cc
@@ -28,6 +28,7 @@ int WJpeg::init(char* tfileName)
 
 void WJpeg::draw()
 {
+#ifndef WIN32
   Log* logger = Log::getInstance();
 
   FILE* infile = fopen(fileName, "r");
@@ -106,5 +107,6 @@ void WJpeg::draw()
   free(buffer);
   logger->log("BJpeg", Log::DEBUG, "deleted buffer");
 
+#endif
 }
 

diff --git a/wjpeg.h b/wjpeg.h
index a647cd1ca8e5a1c823306dceeed6773b9fecbfff..ec2d78dc0845402adfa2c72496b03384408004ed 100644 (file)
--- a/wjpeg.h
+++ b/wjpeg.h
@@ -23,10 +23,14 @@
 
 #include <stdio.h>
 #include <malloc.h>
+#ifndef WIN32
 extern "C"
 {
   #include <jpeglib.h>
 }
+#else
+//TODO find a replacement on WIN32
+#endif
 
 #include "log.h"
 #include "widget.h"