Replaced _MSC_VER with _WIN32 which will work on all windows compilers, not just...

git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@466 e16421f0-f15b-0410-abcd-98678b794739

diff --git a/bin.h b/bin.h
index ed02494..c16d398 100644 (file)
--- a/bin.h
+++ b/bin.h
@@ -9,7 +9,7 @@
 #ifndef BIN_H
 #define BIN_H
 #include <assert.h>
-#ifdef _MSC_VER
+#ifdef _WIN32
     // To avoid complaints about std::max. Appears to work in VS2008
     #undef min
     #undef max

diff --git a/bin64.h b/bin64.h
index 16279a9..8ca1d6f 100644 (file)
--- a/bin64.h
+++ b/bin64.h
@@ -1,7 +1,7 @@
 #ifndef BIN64_H
 #define BIN64_H
 #include <assert.h>
-#ifdef _MSC_VER
+#ifdef _WIN32
     #include "compat/stdint.h"
 #else
     #include <stdint.h>

diff --git a/compat/hirestimeofday.cpp b/compat/hirestimeofday.cpp
index d98380f..6a03c00 100644 (file)
--- a/compat/hirestimeofday.cpp
+++ b/compat/hirestimeofday.cpp
@@ -7,7 +7,7 @@
 #include <iostream>\r
 #include "compat/hirestimeofday.h"\r
 \r
-#ifndef _MSC_VER\r
+#ifndef _WIN32\r
 #include <sys/time.h>\r
 #endif\r
 \r
@@ -23,7 +23,7 @@ HiResTimeOfDay* HiResTimeOfDay::Instance()
 }\r
 \r
 \r
-#ifdef _MSC_VER\r
+#ifdef _WIN32\r
 #include <windows.h>\r
 #include <sys/timeb.h>\r
 \r
@@ -114,13 +114,13 @@ tint HiResTimeOfDay::getTimeUSec(void)
   \r
 // ARNOTODO: move to p2tp.cpp\r
 \r
-#ifdef _MSC_VER\r
+#ifdef _WIN32\r
 static WSADATA _WSAData;\r
 #endif\r
   \r
 void LibraryInit(void)\r
 {\r
-#ifdef _MSC_VER\r
+#ifdef _WIN32\r
        // win32 requires you to initialize the Winsock DLL with the desired\r
        // specification version\r
        WORD wVersionRequested;\r

diff --git a/compat/hirestimeofday.h b/compat/hirestimeofday.h
index 623a9f3..186a6a8 100644 (file)
--- a/compat/hirestimeofday.h
+++ b/compat/hirestimeofday.h
@@ -8,7 +8,7 @@
 #ifndef HIRESTIMEOFDAY_H\r
 #define HIRESTIMEOFDAY_H\r
 \r
-#ifdef _MSC_VER\r
+#ifdef _WIN32\r
 #include "compat/stdint.h"\r
 #include <windows.h>\r
 #else\r
@@ -33,7 +33,7 @@ public:
     static HiResTimeOfDay* Instance();\r
 \r
 private:\r
-#ifdef _MSC_VER\r
+#ifdef _WIN32\r
        tint     epochstart; // in usec\r
        LARGE_INTEGER epochcounter;\r
     LARGE_INTEGER last;\r

diff --git a/compat/util.cpp b/compat/util.cpp
index c352c5c..986d9f6 100644 (file)
--- a/compat/util.cpp
+++ b/compat/util.cpp
@@ -6,7 +6,7 @@
 #include "util.h"\r
 #include <vector>\r
 \r
-#ifdef _MSC_VER\r
+#ifdef _WIN32\r
 #include <windows.h>\r
 #include <Tchar.h>\r
 #endif\r
@@ -16,7 +16,7 @@ namespace p2tp
 \r
 std::string gettmpdir(void)\r
 {\r
-#ifdef _MSC_VER\r
+#ifdef _WIN32\r
   DWORD result = ::GetTempPath(0, _T(""));\r
   if (result == 0)\r
        throw std::runtime_error("Could not get system temp path");\r

diff --git a/datagram.cpp b/datagram.cpp
index c218e66..5edadd7 100644 (file)
--- a/datagram.cpp
+++ b/datagram.cpp
@@ -8,7 +8,7 @@
  */
 #include <iostream>
 
-#ifdef _MSC_VER
+#ifdef _WIN32
     #include <winsock2.h>
     typedef int socklen_t;
 #else
@@ -37,7 +37,7 @@ int Datagram::Recv () {
        length = recvfrom (sock, (char *)buf, MAXDGRAMSZ, 0,
                                           (struct sockaddr*)&(addr), &addrlen);
        if (length<0)
-#ifdef _MSC_VER
+#ifdef _WIN32
                PLOG(ERROR)<<"on recv" << WSAGetLastError() << "\n";
 #else
                PLOG(ERROR)<<"on recv";
@@ -71,7 +71,7 @@ SOCKET Datagram::Wait (int sockcnt, SOCKET* sockets, tint usec) {
                        if (FD_ISSET(sockets[i],&bases))
                                return sockets[i];
        } else if (sel<0)
-#ifdef _MSC_VER
+#ifdef _WIN32
                PLOG(ERROR)<<"select fails" << WSAGetLastError() << "\n";
 #else
                PLOG(ERROR)<<"select fails";
@@ -96,7 +96,7 @@ SOCKET Datagram::Bind (Address addr_) {
                PLOG(ERROR)<<"socket fails";
         return -1;
     }
-#ifdef _MSC_VER
+#ifdef _WIN32
        u_long enable = 1;
        ioctlsocket(fd, FIONBIO, &enable);
        if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (const char *)&sndbuf, sizeof(int)) != 0 ) {
@@ -132,7 +132,7 @@ SOCKET Datagram::Bind (Address addr_) {
 }
 
 void Datagram::Close (int sock) { // remove from fd_set
-#ifdef _MSC_VER
+#ifdef _WIN32
        if (closesocket(sock)!=0)
 #else
        if (::close(sock)!=0)
@@ -143,7 +143,7 @@ void Datagram::Close (int sock) { // remove from fd_set
 
 std::string sock2str (struct sockaddr_in addr) {
        char ipch[32];
-#ifdef _MSC_VER
+#ifdef _WIN32
        //Vista only: InetNtop(AF_INET,&(addr.sin_addr),ipch,32);
        // IPv4 only:
        struct in_addr inaddr;

diff --git a/datagram.h b/datagram.h
index 3a56152..45099e2 100644 (file)
--- a/datagram.h
+++ b/datagram.h
@@ -9,7 +9,7 @@
 #ifndef DATAGRAM_H
 #define DATAGRAM_H
 
-#ifdef _MSC_VER
+#ifdef _WIN32
     #include "compat/stdint.h"
     #include <winsock2.h>
        #include "compat/unixio.h"
@@ -35,7 +35,7 @@
 namespace p2tp {
 
 #define MAXDGRAMSZ 1400
-#ifndef _MSC_VER
+#ifndef _WIN32
 #define INVALID_SOCKET -1
 #endif
 

diff --git a/hashtree.cpp b/hashtree.cpp
index aa82018..096067a 100644 (file)
--- a/hashtree.cpp
+++ b/hashtree.cpp
@@ -10,7 +10,7 @@
 #include "hashtree.h"
 #include <openssl/sha.h>
 #include <string.h>
-#ifndef _MSC_VER
+#ifndef _WIN32
 #include <sys/mman.h>
 #endif
 #include <sys/stat.h>

diff --git a/p2tp.h b/p2tp.h
index 5fc296a..6b50663 100644 (file)
--- a/p2tp.h
+++ b/p2tp.h
@@ -49,7 +49,7 @@ Messages
 #ifndef P2TP_H
 #define P2TP_H
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include "compat/stdint.h"
 #else
 #include <stdint.h>
@@ -159,7 +159,7 @@ namespace p2tp {
         PiecePicker*    picker_;
                /** File for keeping the Merkle hash tree. */
         int             hashfd_;
-#ifdef _MSC_VER
+#ifdef _WIN32
         HANDLE                 hashmaphandle_;
 #endif
         /** Merkle hash tree: root */

diff --git a/transfer.cpp b/transfer.cpp
index 1bdcd64..7928303 100644 (file)
--- a/transfer.cpp
+++ b/transfer.cpp
@@ -6,7 +6,7 @@
  *  Copyright 2009 Delft University of Technology. All rights reserved.
  *
  */
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include "compat/unixio.h"
 #else
 #include <sys/mman.h>
@@ -112,7 +112,7 @@ void FileTransfer::SetSize (size_t bytes) { // peaks/root must be already set
        fstat(hashfd_, &hash_file_st);
     if ( hash_file_st.st_size != expected_size_ )
         ftruncate(hashfd_, expected_size_);
-#ifdef _MSC_VER
+#ifdef _WIN32
     HANDLE hashhandle = (HANDLE)_get_osfhandle(hashfd_);
     hashmaphandle_ = CreateFileMapping(hashhandle,
                                              NULL,
@@ -291,7 +291,7 @@ void            FileTransfer::OfferPeak (bin64_t pos, const Sha1Hash& hash) {
 
 FileTransfer::~FileTransfer ()
 {
-#ifdef _MSC_VER
+#ifdef _WIN32
        UnmapViewOfFile(hashes_);
        CloseHandle(hashmaphandle_);
 #else