Merge branch 'master' into gh479-conflict-resolution

Unidata · Apr 18, 2018 · d7ead42 · d7ead42
2 parents ee9537b + 9a9326c
commit d7ead42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libdispatch/dv2i.c b/libdispatch/dv2i.c
@@ -12,7 +12,7 @@ See \ref copyright file for copying and redistribution conditions.
 #include <stdio.h>
 #include <stdarg.h>
 #include "netcdf.h"
-#include "math.h"
+#include <math.h>
 
 /** \defgroup v2_api The Version 2 API
 

diff --git a/nc_test4/tst_converts2.c b/nc_test4/tst_converts2.c
@@ -10,7 +10,7 @@
 #include <nc_tests.h>
 #include "err_macros.h"
 #include "netcdf.h"
-#include "math.h"
+#include <math.h>
 
 #define FILE_NAME "tst_converts2.nc"
 #define VAR_NAME "Monkey"