[cdo] 60/84: Fix needed for compilation; gcc 4.9 doesn't like multiple cmds in for

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdo.

commit bb7cb451c1f6c97264b763160b7061e380629aa2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 5 18:36:35 2014 +0100

    Fix needed for compilation; gcc 4.9 doesn't like multiple cmds in for
---
 debian/patches/build-fixes.patch | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/debian/patches/build-fixes.patch b/debian/patches/build-fixes.patch
index ad68222..8773ff3 100644
--- a/debian/patches/build-fixes.patch
+++ b/debian/patches/build-fixes.patch
@@ -1,13 +1,13 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Add explicit declaration.
-Last-Updated: 2013-06-06
+Last-Updated: 2014-07-07
 Forwarded: no
 
-Index: cdo-1.6.3+dfsg.1/src/griddes.c
+Index: cdo-1.6.4+dfsg.1/src/griddes.c
 ===================================================================
---- cdo-1.6.3+dfsg.1.orig/src/griddes.c	2014-02-24 19:15:11.072104268 +0000
-+++ cdo-1.6.3+dfsg.1/src/griddes.c	2014-02-24 19:15:11.064105017 +0000
-@@ -55,6 +55,7 @@
+--- cdo-1.6.4+dfsg.1.orig/src/griddes.c
++++ cdo-1.6.4+dfsg.1/src/griddes.c
+@@ -55,6 +55,7 @@ void extClose(int fileID);
  
  #define MAX_LINE_LEN 65536
  
@@ -15,8 +15,21 @@ Index: cdo-1.6.3+dfsg.1/src/griddes.c
  
  void gridInit(griddes_t *grid)
  {
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: For some reason, top_srcdir support is broken in auto*. Disable tests.
-Last-Updated: 2014-02-24
-Forwarded: no
-
+Index: cdo-1.6.4+dfsg.1/src/remap_distwgt_scrip.c
+===================================================================
+--- cdo-1.6.4+dfsg.1.orig/src/remap_distwgt_scrip.c
++++ cdo-1.6.4+dfsg.1/src/remap_distwgt_scrip.c
+@@ -296,11 +296,12 @@ void grid_search_nbr(int num_neighbors,
+   double distance;     /* Angular distance */
+   double *dist = (double*) malloc(ndist*sizeof(double));
+   int    *adds = (int*) malloc(ndist*sizeof(int));
++  j = 0;
+ 
+ #if defined(_OPENMP) && _OPENMP >= OPENMP4
+ #pragma omp simd
+ #endif
+-  for ( j = 0, i = 0; i < ndist; ++i )
++  for ( i = 0; i < ndist; ++i )
+     {
+       nadd = min_add+i;
+       /* Find distance to this point */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git