diff --git a/bin/dbus/dbusinstance.cpp b/bin/dbus/dbusinstance.cpp index 2028cdabb0e8d80e6b7867561d4904981dae8487..c1cfcd19a3ddf66fee4192b91ff9105e2e47e0c3 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 ffbca3f9ec3032975a39f288096a99f7f77c86e7..357bf0c38aaeee741b49832dc222b75518a66678 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 f7cd8faaf5ac5d525e9d6107382869ab7077a024..556b9ba50c0a5a94b434cd85b2d959944d71db2f 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 d35be2c0e6c00819db8cc925f8d6ebc0640981df..9453511be157438455e9b6794f5fcd622bef2ce5 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 18f5856a5fe8c09b269ad42d93926009ec59a781..d63fd1839ef64a9929993fae5ef3d28c076d5ed9 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 cd5749097db5978aa992f2b77aa3cb4b10fd70a4..5af6ae3310edeee42031fe20e69b61ba4e1b05b0 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 66ffcde7a8d22f618484e781fcb07de3b731549f..e60681d637e96bfb8ce95a00322423f9db6a5d59 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 eb3bb515d17c1d081f8ef0a0bc6165c0255a2b46..c7ab619d89efd75343223c6f25a7ea1777aef62a 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 bc305b8f6cdf74663ec82cb2d337c6ef5c385fa4..06fb6de9eab4abe8e453f64bb3f272e88384cb09 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 a15236e458e1a4eb05da0bd1df16f7fbeb19a566..37695447b29fec333bfdb7f7619734fded892dd5 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 eb992f0ea7c1d558719d896071fd7b41da7bcc92..75976f0bf9dae24d3e3b3714c4261ab527a17638 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 43d85dacb9645323c7411bc407f85254a171b8b8..a1314aaa44d9582348e545fd0d67f23ba112a32c 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 8e5299bfd6af2f0b6870d5b44213acc8fc4353bb..f0da2995f5884014459f6c4d07cd492e2b8c31dd 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 b5b6dd8a8099614af77e01bfae23da6ffa929587..f7914a0485e98f78a2f63fc929c8e9272ad89df1 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 a9f4f28855394a9b121776e06c73b261f5a2bc27..410716d53f995f10ed9b255f2a33303e6c7af965 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 273d710d066ae4983a11169d03069e60c0a77b05..2f93e688f271f4fa3a287b81772e35f35489fc80 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;