Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes into lp:libdrizzle

[Andrew Hutchings]

Adds a suppression for the SHA1 code and reverts the earlier hacky fix I made

[lp:~linuxjedi/libdrizzle/5.1-compiler-fixes]

122. By Drizzle Continuous Integration on 2013-04-29

Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes Build: jenkins-Libdrizzle-102

=== modified file 'libdrizzle/sha1.cc'
--- libdrizzle/sha1.cc	2013-04-28 18:27:40 +0000
+++ libdrizzle/sha1.cc	2013-04-29 06:15:31 +0000
@@ -128,7 +128,7 @@
 void
 SHA1Update(SHA1_CTX *context, const uint8_t *data, size_t len)
 {
-	uint32_t i, j;
+	size_t i, j;
 
 	j = (size_t)((context->count >> 3) & 63);
 	context->count += (len << 3);
 
=== modified file 'm4/ax_harden_compiler_flags.m4'
--- m4/ax_harden_compiler_flags.m4	2013-04-28 18:27:40 +0000
+++ m4/ax_harden_compiler_flags.m4	2013-04-29 06:15:31 +0000
@@ -155,7 +155,7 @@
           _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum])
           _APPEND_COMPILE_FLAGS_ERROR([-Wtrampolines])
           _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
-          _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
+#          _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
           AS_IF([test "x$ac_cv_vcs_checkout" = xyes && test "x$MINGW" != xyes],[
             _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
@@ -275,7 +275,7 @@
           _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum])
           _APPEND_COMPILE_FLAGS_ERROR([-Wtrampolines])
           _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
-          _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
+#          _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
           _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
 #         _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])