From c221eb0e8eb645ff874263d211e242078e5156c4 Mon Sep 17 00:00:00 2001
From: atraczyk <andreastraczyk@gmail.com>
Date: Thu, 23 Jun 2016 10:47:06 -0400
Subject: [PATCH] daemon: avoid intrin.h conflict on Windows
The Microsoft compiler will include the common header <intrin.h>
regardless of the use of quotes. The file "intrin.h" should be renamed,
and all references to it changed, as well as defining the UNUSED macro
to nothing on the Windows platform.
Change-Id: Id04d36e70d149746be8d78eed09aa963514b2810
Tuleap: #801
---
bin/dbus/dbusinstance.cpp | 2 +-
src/Makefile.am | 2 +-
src/account.cpp | 2 +-
src/account.h | 2 +-
src/client/presencemanager.cpp | 2 +-
src/{intrin.h => compiler_intrinsics.h} | 4 ++++
src/fileutils.cpp | 2 +-
src/media/audio/pulseaudio/audiostream.cpp | 2 +-
src/media/audio/pulseaudio/pulselayer.cpp | 2 +-
src/ringdht/sips_transport_ice.cpp | 2 +-
src/security/tls_session.cpp | 2 +-
src/sip/pres_sub_server.cpp | 2 +-
src/sip/sdp.cpp | 2 +-
src/sip/sipaccount.cpp | 2 +-
src/sip/siptransport.cpp | 2 +-
src/upnp/upnp_context.cpp | 2 +-
16 files changed, 19 insertions(+), 15 deletions(-)
rename src/{intrin.h => compiler_intrinsics.h} (95%)
diff --git a/bin/dbus/dbusinstance.cpp b/bin/dbus/dbusinstance.cpp
index 2028cdabb0..c1cfcd19a3 100644
--- a/bin/dbus/dbusinstance.cpp
+++ b/bin/dbus/dbusinstance.cpp
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include "dbusinstance.h"
DBusInstance::DBusInstance(DBus::Connection& connection,
diff --git a/src/Makefile.am b/src/Makefile.am
index ffbca3f9ec..357bf0c38a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,7 +111,7 @@ libring_la_SOURCES = \
noncopyable.h \
utf8_utils.h \
ring_types.h \
- intrin.h \
+ compiler_intrinsics.h \
array_size.h \
account_schema.h \
registration_states.h \
diff --git a/src/account.cpp b/src/account.cpp
index f7cd8faaf5..556b9ba50c 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -53,7 +53,7 @@ using random_device = dht::crypto::random_device;
#include "upnp/upnp_control.h"
#include "ip_utils.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include "dring/account_const.h"
namespace ring {
diff --git a/src/account.h b/src/account.h
index d35be2c0e6..9453511be1 100644
--- a/src/account.h
+++ b/src/account.h
@@ -34,7 +34,7 @@
#include "ip_utils.h"
#include "media_codec.h"
#include "logger.h"
-#include "intrin.h" // UNUSED
+#include "compiler_intrinsics.h" // UNUSED
#include <functional>
#include <string>
diff --git a/src/client/presencemanager.cpp b/src/client/presencemanager.cpp
index 18f5856a5f..d63fd1839e 100644
--- a/src/client/presencemanager.cpp
+++ b/src/client/presencemanager.cpp
@@ -35,7 +35,7 @@
#include "sip/sippresence.h"
#include "sip/pres_sub_client.h"
#include "client/ring_signal.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
namespace DRing {
diff --git a/src/intrin.h b/src/compiler_intrinsics.h
similarity index 95%
rename from src/intrin.h
rename to src/compiler_intrinsics.h
index cd5749097d..5af6ae3310 100644
--- a/src/intrin.h
+++ b/src/compiler_intrinsics.h
@@ -23,6 +23,10 @@
#ifndef INTRIN_H_
#define INTRIN_H_
+#ifdef WIN32_NATIVE
+#define UNUSED
+#else
#define UNUSED __attribute__((__unused__))
+#endif
#endif // INTRIN_H_
diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index 66ffcde7a8..e60681d637 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -26,7 +26,7 @@
#include "fileutils.h"
#include "logger.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#ifdef __APPLE__
#include <TargetConditionals.h>
diff --git a/src/media/audio/pulseaudio/audiostream.cpp b/src/media/audio/pulseaudio/audiostream.cpp
index eb3bb515d1..c7ab619d89 100644
--- a/src/media/audio/pulseaudio/audiostream.cpp
+++ b/src/media/audio/pulseaudio/audiostream.cpp
@@ -21,7 +21,7 @@
#include "audiostream.h"
#include "pulselayer.h"
#include "logger.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include <stdexcept>
diff --git a/src/media/audio/pulseaudio/pulselayer.cpp b/src/media/audio/pulseaudio/pulselayer.cpp
index bc305b8f6c..06fb6de9ea 100644
--- a/src/media/audio/pulseaudio/pulselayer.cpp
+++ b/src/media/audio/pulseaudio/pulselayer.cpp
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include "audiostream.h"
#include "pulselayer.h"
#include "audio/resampler.h"
diff --git a/src/ringdht/sips_transport_ice.cpp b/src/ringdht/sips_transport_ice.cpp
index a15236e458..37695447b2 100644
--- a/src/ringdht/sips_transport_ice.cpp
+++ b/src/ringdht/sips_transport_ice.cpp
@@ -25,7 +25,7 @@
#include "manager.h"
#include "sip/sip_utils.h"
#include "logger.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include <opendht/crypto.h>
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index eb992f0ea7..75976f0bf9 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -28,7 +28,7 @@
#include "ice_transport.h"
#include "logger.h"
#include "noncopyable.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include <gnutls/dtls.h>
#include <gnutls/abstract.h>
diff --git a/src/sip/pres_sub_server.cpp b/src/sip/pres_sub_server.cpp
index 43d85dacb9..a1314aaa44 100644
--- a/src/sip/pres_sub_server.cpp
+++ b/src/sip/pres_sub_server.cpp
@@ -29,7 +29,7 @@
#include "pres_sub_server.h"
#include "client/ring_signal.h"
#include "sip_utils.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
namespace ring {
diff --git a/src/sip/sdp.cpp b/src/sip/sdp.cpp
index 8e5299bfd6..f0da2995f5 100644
--- a/src/sip/sdp.cpp
+++ b/src/sip/sdp.cpp
@@ -39,7 +39,7 @@
#include "media_codec.h"
#include "system_codec_container.h"
-#include "intrin.h" // for UNUSED
+#include "compiler_intrinsics.h" // for UNUSED
#include <opendht/rng.h>
using random_device = dht::crypto::random_device;
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index b5b6dd8a80..f7914a0485 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#endif
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include "sdp.h"
#include "sipvoiplink.h"
diff --git a/src/sip/siptransport.cpp b/src/sip/siptransport.cpp
index a9f4f28855..410716d53f 100644
--- a/src/sip/siptransport.cpp
+++ b/src/sip/siptransport.cpp
@@ -27,7 +27,7 @@
#include "ringdht/sips_transport_ice.h"
#include "array_size.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include "sipvoiplink.h"
#include <pjsip.h>
diff --git a/src/upnp/upnp_context.cpp b/src/upnp/upnp_context.cpp
index 273d710d06..2f93e688f2 100644
--- a/src/upnp/upnp_context.cpp
+++ b/src/upnp/upnp_context.cpp
@@ -45,7 +45,7 @@
#include "logger.h"
#include "ip_utils.h"
#include "upnp_igd.h"
-#include "intrin.h"
+#include "compiler_intrinsics.h"
#include <opendht/rng.h>
using random_device = dht::crypto::random_device;
--
GitLab