From 84889ea4c0051c9b4b91e3361f6156e6f1f726dd Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Mon, 26 Nov 2012 18:15:56 -0600
Subject: Fix automake warnings.

---
 .../protocols/jabber/jingle/libjingle/talk/base/criticalsection.h | 4 ++--
 .../protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc  | 4 ++--
 kopete/protocols/jabber/jingle/libjingle/talk/base/winping.h      | 2 +-
 kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.h     | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kopete/protocols/jabber')

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h
index b75ad5c7..145ceba1 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h
@@ -40,7 +40,7 @@
 #define CS_TRACK_OWNER 1
 #endif  // _DEBUG
 
-#if CS_TRACK_OWNER
+#ifdef CS_TRACK_OWNER
 #define TRACK_OWNER(x) x
 #else  // !CS_TRACK_OWNER
 #define TRACK_OWNER(x)
@@ -68,7 +68,7 @@ public:
     LeaveCriticalSection(&crit_);
   }
 
-#if CS_TRACK_OWNER
+#ifdef CS_TRACK_OWNER
   bool CurrentThreadIsOwner() const { return thread_ == GetCurrentThreadId(); }
 #endif  // CS_TRACK_OWNER
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc
index f0228fbd..30d43fc6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc
@@ -246,14 +246,14 @@ uint32 SocketAddress::StringToIP(const std::string& hostname, bool use_dns) {
     LOG(INFO) << "=== DNS RESOLUTION (" << hostname << ") ===";
 #if DISABLE_DNS
     LOG(WARNING) << "*** DNS DISABLED ***";
-#if WIN32
+#ifdef WIN32
     WSASetLastError(WSAHOST_NOT_FOUND);
 #endif // WIN32
 #endif // DISABLE_DNS
     if (hostent * pHost = gethostbyname(hostname.c_str())) {
       ip = NetworkToHost32(*reinterpret_cast<uint32 *>(pHost->h_addr_list[0]));
     } else {
-#if WIN32
+#ifdef WIN32
       LOG(LS_ERROR) << "gethostbyname error: " << WSAGetLastError();
 #else
       LOG(LS_ERROR) << "gethostbyname error: " << strerror(h_errno);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/winping.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/winping.h
index 99ba2fdc..dfe09526 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/winping.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/winping.h
@@ -30,7 +30,7 @@
 
 #ifdef WIN32
 
-#if _MSC_VER > 1000
+#if defined(_MSC_VER) && _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.h b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.h
index 27a8e4be..c75b1a9e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.h
@@ -196,7 +196,7 @@ class StunAddressAttribute : public StunAttribute {
 public:
   StunAddressAttribute(uint16 type);
 
-#if (_MSC_VER < 1300)
+#if defined(_MSC_VER) && _MSC_VER < 1300
   enum { SIZE = 8 };
 #else
   static const uint16 SIZE = 8;
@@ -224,7 +224,7 @@ class StunUInt32Attribute : public StunAttribute {
 public:
   StunUInt32Attribute(uint16 type);
 
-#if (_MSC_VER < 1300)
+#if defined(_MSC_VER) && _MSC_VER < 1300
   enum { SIZE = 4 };
 #else
   static const uint16 SIZE = 4;
@@ -273,7 +273,7 @@ public:
   StunErrorCodeAttribute(uint16 type, uint16 length);
   ~StunErrorCodeAttribute();
 
-#if (_MSC_VER < 1300)
+#if defined(_MSC_VER) && _MSC_VER < 1300
   enum { MIN_SIZE = 4 };
 #else
   static const uint16 MIN_SIZE = 4;
@@ -323,7 +323,7 @@ public:
   StunTransportPrefsAttribute(uint16 type, uint16 length);
   ~StunTransportPrefsAttribute();
 
-#if (_MSC_VER < 1300)
+#if defined(_MSC_VER) && _MSC_VER < 1300
   enum { SIZE1 = 4, SIZE2 = 12 };
 #else
   static const uint16 SIZE1 = 4;
-- 
cgit v1.2.1