htcp

commit e541a726db816d7982bc09d24f307687a675feaa
parent b738448a2f1c41d939c079280069510fc32eec2d
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue,  4 Dec 2018 14:12:33 +0100

Fix GCC warnings and errors with NetCDF 4.4.0

Diffstat:
M
cmake/les2htcp/CMakeLists.txt
 | 
3
+++
M
src/les2htcp.c
 | 
6
+++---

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cmake/les2htcp/CMakeLists.txt b/cmake/les2htcp/CMakeLists.txt
@@ -16,6 +16,9 @@
 cmake_minimum_required(VERSION 2.8)
 project(les2htcp C)
 
+# Required by netcdf.h header that in some versions have C99 comments
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu89")
+
 ################################################################################
 # Check dependencies
 ################################################################################
diff --git a/src/les2htcp.c b/src/les2htcp.c
@@ -192,10 +192,10 @@ grid_release(struct grid* grid)
 #define NDIMS_MAX 4
 
 static INLINE const char*
-ncerr_to_str(const int ncerr)
+ncerr_to_str(const int err)
 {
   const char* str = "NC_ERR_<UNKNOWN>";
-  switch(ncerr) {
+  switch(err) {
     case NC_EBADGRPID: str = "NC_EBADGRPID"; break;
     case NC_EBADID: str = "NC_EBADID"; break;
     case NC_EBADNAME: str = "NC_EBADNAME"; break;
@@ -915,7 +915,7 @@ main(int argc, char** argv)
     if(!grid.is_z_irregular) {
       grid.vxsz_z[0] *= args.fp_to_meter;
     } else {
-      size_t i;
+      int32_t i;
       FOR_EACH(i, 0, grid.nz) {
         grid.vxsz_z[i] *= args.fp_to_meter;
       }