Commit da949e85 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Moved FILETYPE_UNDEF to cdi_int.h.

parent 575a9ea6
......@@ -44,7 +44,6 @@ extern "C" {
/* File types */
#define FILETYPE_UNDEF -1 /* Unknown/not yet defined file type */
#define FILETYPE_GRB 1 /* File type GRIB */
#define FILETYPE_GRB2 2 /* File type GRIB version 2 */
#define FILETYPE_NC 3 /* File type NetCDF */
......
......@@ -52,8 +52,6 @@
!
! File types
!
INTEGER FILETYPE_UNDEF
PARAMETER (FILETYPE_UNDEF = -1)
INTEGER FILETYPE_GRB
PARAMETER (FILETYPE_GRB = 1)
INTEGER FILETYPE_GRB2
......
......@@ -301,6 +301,7 @@ typedef enum {
} CdiTimeType;
#define FILETYPE_UNDEF -1 /* Unknown/not yet defined file type */
extern int CDI_Debug; /* If set to 1, debuggig (default 0) */
......
......@@ -763,16 +763,22 @@ static void fortran_interface(char *fname, char *fnameinc, char *fnameint,
if ( isspace((int) pline[i]) ) break;
}
if ( i == len ) continue;
parname[i] = 0;
pline += i+1;
while ( isspace((int) *pline) ) pline++;
if ( ! (isdigit((int) *pline) || *pline == '-') ) continue;
parvalue = atoi(pline);
if ( isdigit((int) *pline) || *pline == '-' )
{
parname[i] = 0;
parvalue = atoi(pline);
/* fortran include */
fprintf(fpinc, " INTEGER %-22s\n"
" PARAMETER (%-22s = %2d)\n", parname, parname,
parvalue);
/* fortran include */
fprintf(fpinc, " INTEGER %-22s\n"
" PARAMETER (%-22s = %2d)\n", parname, parname, parvalue);
}
else
{
if ( strncmp(parname, "CDI_H_", 6) == 0 ) continue;
fprintf(fpinc, "%s\n", line);
}
}
else if (!regexec(&cppCondRE, line, maxMatch, reMatch, 0)
&& ((cppSwitchLen = reMatch[2].rm_eo - reMatch[2].rm_so) == 5)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment