X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Ferror.cc;h=cd14e06bec05a7411e6eb0041ac4d67b70886ecb;hb=b74783f0513395a659f1b8cad12b1a6acad1503e;hp=d148aafe1c930acd49bc5f769e7e2cb72fed6a0d;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/error.cc b/src/libmemcached/error.cc
index d148aafe..cd14e06b 100644
--- a/src/libmemcached/error.cc
+++ b/src/libmemcached/error.cc
@@ -129,7 +129,7 @@ static void _set(Memcached &memc, memcached_string_t *str, memcached_return_t &r
 #elif defined(HAVE_STRERROR_R) && HAVE_STRERROR_R
       strerror_r(local_errno, errmsg, sizeof(errmsg));
       errmsg_ptr = errmsg;
-#elif defined(HAVE_STRERROR) && HAVE_STRERROR
+#else
       snprintf(errmsg, sizeof(errmsg), "%s", strerror(local_errno));
       errmsg_ptr = errmsg;
 #endif
@@ -191,10 +191,6 @@ memcached_return_t memcached_set_error(memcached_instance_st &self, memcached_re
   return memcached_set_error(self, rc, at, tmp);
 }
 
-#ifndef __INTEL_COMPILER
-#  pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
-
 memcached_return_t memcached_set_error(Memcached &memc, memcached_return_t rc, const char *at,
                                        memcached_string_t &str) {
   assert_msg(rc != MEMCACHED_ERRNO,