Merge branch 'master' into aweather

[~andy/rsl] / src / nsig.c

diff --git a/nsig.c b/src/nsig.c
similarity index 99%
rename from nsig.c
rename to src/nsig.c
index 256f26501fffc4d5037dc0876ca8bb2e956b2e7b..9ae591356cbd02b6d50b82377f452aef2e44cf31 100644 (file)
--- a/nsig.c
+++ b/src/nsig.c
@@ -391,12 +391,15 @@ NSIG_Ray *nsig_read_ray(FILE *fp)
 NSIG_Sweep **nsig_read_sweep(FILE *fp, NSIG_Product_file *prod_file)
 {
   NSIG_Sweep **s;
-  int i, j, n;
+  int i, n;
   static NSIG_Ingest_data_header **idh = NULL;
   static NSIG_Raw_prod_bhdr *bhdr = NULL;
   NSIG_Ray *nsig_ray;
   int data_mask, iray, nrays[12], max_rays;
+#ifdef NSIG_VER2
+  int j;
   int masks[5];
+#endif
   int nparams;
   int is_new_ray;
   int idtype[12];