Fix some C++ issues.

src/Splitsel.c

@@ -124,6 +124,8 @@ void *Splitsel(void *argument)
 	}
     }
 
+  int index = 0;
+  int nsets = 0;
 
   /* offset */
   for ( tsID = 0; tsID < noffset; tsID++ )
@@ -147,8 +149,6 @@ void *Splitsel(void *argument)
           }
     }
 
-  int index = 0;
-  int nsets = 0;
   while ( TRUE )
     {
       sprintf(filename+nchars, "%06d", index);

src/expr_fun.c

@@ -51,7 +51,7 @@ double *fld_weights(int gridID, size_t ngp)
 }
 
 
-int getLayerThickness(int genbounds, int index, int zaxisID, int nlev, double *thickness, double *weights);
+int getLayerThickness(bool genbounds, int index, int zaxisID, int nlev, double *thickness, double *weights);
 
 double *vert_weights(int zaxisID, size_t nlev)
 {

src/parse_cmor_table.c

@@ -288,7 +288,7 @@ void parse_json_buffer_to_pml(list_t *pml, size_t buffersize, char *buffer)
 
   /* Allocate some tokens as a start */
   size_t tokcount = 2;
-  jsmntok_t *tok = Malloc(sizeof(*tok) * tokcount);
+  jsmntok_t *tok = (jsmntok_t *) Malloc(sizeof(*tok) * tokcount);
 
   int r;
  AGAIN:
@@ -298,7 +298,7 @@ void parse_json_buffer_to_pml(list_t *pml, size_t buffersize, char *buffer)
       if ( r == JSMN_ERROR_NOMEM )
         {
           tokcount = tokcount * 2;
-          tok = Realloc(tok, sizeof(*tok) * tokcount);
+          tok = (jsmntok_t *) Realloc(tok, sizeof(*tok) * tokcount);
           goto AGAIN;
         }
     }