From cc4ee13ddf7633869408a78e0e0c092b1a03ebf2 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 19 Nov 2009 09:50:08 +0100
Subject: Misc tidy-up

---
 src/diffraction.c | 2 +-
 src/ewald.c       | 1 +
 src/image.c       | 8 ++++----
 src/utils.c       | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/diffraction.c b/src/diffraction.c
index 461063ad..e7a16a95 100644
--- a/src/diffraction.c
+++ b/src/diffraction.c
@@ -111,7 +111,7 @@ static double complex molecule_factor(struct molecule *mol, struct threevec q,
 }
 
 
-double complex water_factor(struct threevec q, double en)
+static double complex water_factor(struct threevec q, double en)
 {
 	double x;
 	double complex res = 0.0;
diff --git a/src/ewald.c b/src/ewald.c
index 9968538e..02974175 100644
--- a/src/ewald.c
+++ b/src/ewald.c
@@ -17,6 +17,7 @@
 #include "image.h"
 #include "utils.h"
 #include "cell.h"
+#include "ewald.h"
 
 
 void get_ewald(struct image *image)
diff --git a/src/image.c b/src/image.c
index 04d0f35d..7ce3564f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -126,12 +126,12 @@ struct imagefeature *image_feature_closest(ImageFeatureList *flist,
 
 	for ( i=0; i<flist->n_features; i++ ) {
 
-		double d;
+		double ds;
 
-		d = distance(flist->features[i].x, flist->features[i].y, x, y);
+		ds = distance(flist->features[i].x, flist->features[i].y, x, y);
 
-		if ( d < dmin ) {
-			dmin = d;
+		if ( ds < dmin ) {
+			dmin = ds;
 			closest = i;
 		}
 
diff --git a/src/utils.c b/src/utils.c
index 2e536979..d456ec70 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -11,6 +11,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "utils.h"
 
-- 
cgit v1.2.3