diff --git a/src/unix/getaddrinfo.c b/src/unix/getaddrinfo.c
index 6d23fbe0..d7ca7d1a 100644
--- a/src/unix/getaddrinfo.c
+++ b/src/unix/getaddrinfo.c
@@ -92,7 +92,9 @@ int uv__getaddrinfo_translate_error(int sys_err) {
   }
   assert(!"unknown EAI_* error code");
   abort();
+#ifndef __SUNPRO_C
   return 0;  /* Pacify compiler. */
+#endif
 }
 
 
diff --git a/src/unix/thread.c b/src/unix/thread.c
index c17a51fe..6088c77f 100644
--- a/src/unix/thread.c
+++ b/src/unix/thread.c
@@ -801,7 +801,9 @@ int uv_cond_timedwait(uv_cond_t* cond, uv_mutex_t* mutex, uint64_t timeout) {
     return UV_ETIMEDOUT;
 
   abort();
+#ifndef __SUNPRO_C
   return UV_EINVAL;  /* Satisfy the compiler. */
+#endif
 }
 
 
diff --git a/src/unix/udp.c b/src/unix/udp.c
index 23eadb8d..15fa5937 100644
--- a/src/unix/udp.c
+++ b/src/unix/udp.c
@@ -805,13 +805,17 @@ int uv_udp_set_ttl(uv_udp_t* handle, int ttl) {
                         IPV6_UNICAST_HOPS,
                         &ttl,
                         sizeof(ttl));
-#endif /* defined(__sun) || defined(_AIX) || defined (__OpenBSD__) ||
-          defined(__MVS__) */
+
+#else /* !(defined(__sun) || defined(_AIX) || defined (__OpenBSD__) ||
+           defined(__MVS__)) */
 
   return uv__setsockopt_maybe_char(handle,
                                    IP_TTL,
                                    IPV6_UNICAST_HOPS,
                                    ttl);
+
+#endif /* defined(__sun) || defined(_AIX) || defined (__OpenBSD__) ||
+          defined(__MVS__) */
 }
 
 
diff --git a/src/uv-data-getter-setters.c b/src/uv-data-getter-setters.c
index b7fcd4a7..c3025662 100644
--- a/src/uv-data-getter-setters.c
+++ b/src/uv-data-getter-setters.c
@@ -36,7 +36,7 @@ const char* uv_req_type_name(uv_req_type type) {
   case UV_REQ_TYPE_MAX:
   case UV_UNKNOWN_REQ:
   default: /* UV_REQ_TYPE_PRIVATE */
-     return NULL;
+    break;
   }
   return NULL;
 }
diff --git a/test/run-tests.c b/test/run-tests.c
index eba28ecb..522d80c7 100644
--- a/test/run-tests.c
+++ b/test/run-tests.c
@@ -67,7 +67,9 @@ int main(int argc, char **argv) {
     return EXIT_FAILURE;
   }
 
+#ifndef __SUNPRO_C
   return EXIT_SUCCESS;
+#endif
 }
 
 
diff --git a/test/test-spawn.c b/test/test-spawn.c
index 05c76f61..1a175825 100644
--- a/test/test-spawn.c
+++ b/test/test-spawn.c
@@ -1861,7 +1861,9 @@ int spawn_stdin_stdout(void) {
       c = c - w;
     }
   }
+#ifndef __SUNPRO_C
   return 2;
+#endif
 }
 #else
 int spawn_stdin_stdout(void) {