From 0bc5211bb92577f42053153204ead78ebc6f3dee Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Tue, 14 Feb 2012 08:08:30 -0800 Subject: [PATCH] Merge in removal of no-format-security, and fix signed issue from debian. --- libmemcached/io.cc | 4 ++-- m4/pandora_warnings.m4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libmemcached/io.cc b/libmemcached/io.cc index 48c0de6c..e0c6284b 100644 --- a/libmemcached/io.cc +++ b/libmemcached/io.cc @@ -675,7 +675,7 @@ memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st { #define MAX_SERVERS_TO_POLL 100 struct pollfd fds[MAX_SERVERS_TO_POLL]; - unsigned int host_index= 0; + nfds_t host_index= 0; for (uint32_t x= 0; x < memcached_server_count(memc) and host_index < MAX_SERVERS_TO_POLL; ++x) { @@ -722,7 +722,7 @@ memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st break; default: - for (ptrdiff_t x= 0; x < host_index; ++x) + for (nfds_t x= 0; x < host_index; ++x) { if (fds[x].revents & POLLIN) { diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4 index 42cee56b..89103bd6 100644 --- a/m4/pandora_warnings.m4 +++ b/m4/pandora_warnings.m4 @@ -184,8 +184,8 @@ foo(); [ac_cv_safe_to_use_wformat_=no]) CFLAGS="$save_CFLAGS"]) AS_IF([test "$ac_cv_safe_to_use_wformat_" = "yes"],[ - BASE_WARNINGS="${BASE_WARNINGS} -Wformat -Wno-format-nonliteral -Wno-format-security" - BASE_WARNINGS_FULL="${BASE_WARNINGS_FULL} -Wformat=2 -Wno-format-nonliteral -Wno-format-security" + BASE_WARNINGS="${BASE_WARNINGS} -Wformat -Wno-format-nonliteral -Wformat-security" + BASE_WARNINGS_FULL="${BASE_WARNINGS_FULL} -Wformat=2 -Wno-format-nonliteral -Wformat-security" ],[ BASE_WARNINGS="${BASE_WARNINGS} -Wno-format" BASE_WARNINGS_FULL="${BASE_WARNINGS_FULL} -Wno-format" -- 2.30.2