Renamed CHUNK_XXX to CDI_CHUNK_XXX.

src/Filedes.c

@@ -211,17 +211,17 @@ void partab(FILE *fp, int streamID, int option)
 	  }
 
       int chunktype = vlistInqVarChunkType(vlistID, varID);
-      if ( chunktype == CHUNK_AUTO )
+      if ( chunktype == CDI_CHUNK_AUTO )
 	{
 	  fprintf(fp, "  chunktype=auto");
 	  if ( linebreak ) fprintf(fp, "\n");
 	}
-      else if ( chunktype == CHUNK_GRID )
+      else if ( chunktype == CDI_CHUNK_GRID )
 	{
 	  fprintf(fp, "  chunktype=grid");
 	  if ( linebreak ) fprintf(fp, "\n");
 	}
-      if ( chunktype == CHUNK_LINES )
+      if ( chunktype == CDI_CHUNK_LINES )
 	{
 	  fprintf(fp, "  chunktype=lines");
 	  if ( linebreak ) fprintf(fp, "\n");

src/cdo.c

@@ -661,9 +661,9 @@ void defineCompress(const char *arg)
 static
 void defineChunktype(const char *arg)
 {
-  if      ( strcmp("auto",  arg)   == 0 ) cdoChunkType = CHUNK_AUTO;
-  else if ( strcmp("grid",  arg)   == 0 ) cdoChunkType = CHUNK_GRID;
-  else if ( strcmp("lines", arg)   == 0 ) cdoChunkType = CHUNK_LINES;
+  if      ( strcmp("auto",  arg)   == 0 ) cdoChunkType = CDI_CHUNK_AUTO;
+  else if ( strcmp("grid",  arg)   == 0 ) cdoChunkType = CDI_CHUNK_GRID;
+  else if ( strcmp("lines", arg)   == 0 ) cdoChunkType = CDI_CHUNK_LINES;
   else
     {
       fprintf(stderr, "Chunk type '%s' unsupported!\n", arg);