replaced uuid[CDI_UUID_SIZE] with *uuid, changed __restrict__ back to restrict

src/basetime.c

@@ -32,3 +32,4 @@ void basetimeInit(basetime_t *basetime)
  * require-trailing-newline: t
  * End:
  */
+ 
\ No newline at end of file

src/cdi.h

@@ -842,10 +842,10 @@ void    gridDefReference(int gridID, const char *reference);
 int     gridInqReference(int gridID, char *reference);
 
 /*      gridDefUUID: Define the UUID of an unstructured grid */
-void    gridDefUUID(int gridID, const unsigned char uuid[CDI_UUID_SIZE]);
+void    gridDefUUID(int gridID, const unsigned char *uuid);
 
 /*      gridInqUUID: Get the UUID of an unstructured grid */
-void    gridInqUUID(int gridID, unsigned char uuid[CDI_UUID_SIZE]);
+void    gridInqUUID(int gridID, unsigned char *uuid);
 
 
 /* Lambert Conformal Conic grid (GRIB version) */
@@ -1097,7 +1097,7 @@ const char *modelInqNamePtr(int modelID);
 void    tableWriteC(const char *filename, int tableID);
 void    tableFWriteC(FILE *ptfp, int tableID);
 void    tableWrite(const char *filename, int tableID);
-int     tableRead(char *tablefile);
+int     tableRead(const char *tablefile);
 int     tableDef(int modelID, int tablenum, const char *tablename);
 
 const char *tableInqNamePtr(int tableID);

src/gaussgrid.c

@@ -288,7 +288,7 @@ void gauaw_old(double *pa, double *pw, int nlat)
 }
 #endif
 
-void gaussaw(double *__restrict__ pa, double *__restrict__ pw, size_t nlat)
+void gaussaw(double *restrict pa, double *restrict pw, size_t nlat)
 {
   //gauaw_old(pa, pw, nlat);
   gauaw(nlat, pa, pw);

src/resource_unpack.c

@@ -67,7 +67,7 @@ void reshUnpackResources(char * unpackBuffer, int unpackBufferSize,
 	case STREAM:
           if (sizeAssociations == numAssociations)
             associations
-              = xrealloc(associations,
+              = (struct streamAssoc *)xrealloc(associations,
                          sizeof (associations[0]) * (size_t)(sizeAssociations *= 2));
 	  associations[numAssociations]
             = streamUnpack(unpackBuffer, unpackBufferSize, &unpackBufferPos,