Commit c221eb0e authored by atraczyk's avatar atraczyk

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
parent f447e3c6
......@@ -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,
......
......@@ -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 \
......
......@@ -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 {
......
......@@ -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>
......
......@@ -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 {
......
......@@ -23,6 +23,10 @@
#ifndef INTRIN_H_
#define INTRIN_H_
#ifdef WIN32_NATIVE
#define UNUSED
#else
#define UNUSED __attribute__((__unused__))
#endif
#endif // INTRIN_H_
......@@ -26,7 +26,7 @@
#include "fileutils.h"
#include "logger.h"
#include "intrin.h"
#include "compiler_intrinsics.h"
#ifdef __APPLE__
#include <TargetConditionals.h>
......
......@@ -21,7 +21,7 @@
#include "audiostream.h"
#include "pulselayer.h"
#include "logger.h"
#include "intrin.h"
#include "compiler_intrinsics.h"
#include <stdexcept>
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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 {
......
......@@ -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;
......
......@@ -26,7 +26,7 @@
#include "config.h"
#endif
#include "intrin.h"
#include "compiler_intrinsics.h"
#include "sdp.h"
#include "sipvoiplink.h"
......
......@@ -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>
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment