diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5546850c..c6d9fc1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,9 +110,15 @@ option(LIBZMQ_PEDANTIC "" ON)
 option(LIBZMQ_WERROR "" OFF)
 
 if(LIBZMQ_PEDANTIC)
-  zmq_check_cxx_flag_prepend("-pedantic") # GCC
-  zmq_check_cxx_flag_prepend("-strict-ansi") # ICC
-  zmq_check_cxx_flag_prepend("-compat=5") # Sun Studio
+  zmq_check_cxx_flag_prepend("-pedantic")
+
+  if(${CMAKE_CXX_COMPILER_ID} MATCHES "Intel")
+    zmq_check_cxx_flag_prepend("-strict-ansi")
+  endif()
+
+  if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
+    zmq_check_cxx_flag_prepend("-compat=5")
+  endif()
 endif()
 
 if(LIBZMQ_WERROR)
diff --git a/src/decoder.hpp b/src/decoder.hpp
index 4ed2eb31..7235045a 100644
--- a/src/decoder.hpp
+++ b/src/decoder.hpp
@@ -163,7 +163,7 @@ namespace zmq
             return false;
         }
 
-        inline bool message_ready_size (size_t msg_sz)
+        inline bool message_ready_size (size_t /* msg_sz */)
         {
             zmq_assert (false);
             return false;
diff --git a/src/zmq.cpp b/src/zmq.cpp
index 5e5ad58a..6a74989b 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -980,7 +980,7 @@ int zmq_proxy (void *frontend_, void *backend_, void *control_)
 
 //  The deprecated device functionality
 
-int zmq_device (int type, void *frontend_, void *backend_)
+int zmq_device (int /* type */, void *frontend_, void *backend_)
 {
     return zmq::proxy (
         (zmq::socket_base_t*) frontend_,
@@ -989,7 +989,7 @@ int zmq_device (int type, void *frontend_, void *backend_)
 
 //  Callback to free socket event data
 
-void zmq_free_event (void *event_data, void *hint)
+void zmq_free_event (void *event_data, void * /* hint */)
 {
     zmq_event_t *event = (zmq_event_t *) event_data;