Moved variable decl to start of block for old gcc

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 5646a147dad6c1d529998624f138f745ab9c45a9..04b643f3ecae98441fe8223b986b1b658fe6a391 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -72,6 +72,10 @@ PP/13 Bugzilla 1086: Deal with maildir quota file races.
 PP/14 Bugzilla 1019: DKIM multiple signature generation fix.
       Patch from Uwe Doering, sign-off by Michael Haardt.
 
 PP/14 Bugzilla 1019: DKIM multiple signature generation fix.
       Patch from Uwe Doering, sign-off by Michael Haardt.
 

+NM/05 Fix to spam.c to accommodate older gcc versions which dislike
+      variable declaration deep within a block.  Bug and patch from
+      Dennis Davis.
+

 
 Exim version 4.74
 -----------------
 
 Exim version 4.74
 -----------------

diff --git a/src/src/spam.c b/src/src/spam.c
index 55999a3971b27b162263769637c76b78c741bdc5..3d38d99dd6a7747f1d527a70eafc7ef9cf7fd471 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -150,6 +150,7 @@ int spam(uschar **listptr) {
     };
 
     while ( num_servers > 0 ) {
     };
 
     while ( num_servers > 0 ) {

+      int i;

 
       /* Randomly pick a server to try */
       current_server = random_number( num_servers );
 
       /* Randomly pick a server to try */
       current_server = random_number( num_servers );


@@ -185,7 +186,6 @@ int spam(uschar **listptr) {
 
       /* Remove the server from the list. XXX We should free the memory */
       num_servers--;
 
       /* Remove the server from the list. XXX We should free the memory */
       num_servers--;

-      int i;

       for( i = current_server; i < num_servers; i++ )
         spamd_address_vector[i] = spamd_address_vector[i+1];
     }
       for( i = current_server; i < num_servers; i++ )
         spamd_address_vector[i] = spamd_address_vector[i+1];
     }