Merge branch 'testing' of https://github.com/gbvalor/bufr2synop into …

…testing
gbvalor · Aug 8, 2022 · 5acc39c · 5acc39c
2 parents 2028659 + 2aa77c0
commit 5acc39c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/apps/bufrnoaa_io.c b/src/apps/bufrnoaa_io.c
@@ -82,9 +82,9 @@ char *bufrnoaa_get_version(char *version, char *build, char *builder, int *versi
   if (build)
     {
        c = build;
-#ifdef __INTEL_COMPILER
-       c += sprintf(build, "using INTEL C compiler icc %s ", __INTEL_COMPILER);
-#elifdef __GNUC__ 
+#if defined(__INTEL_COMPILER)
+       c += sprintf(build, "using INTEL C compiler icc %d.%d ", __INTEL_COMPILER, __INTEL_COMPILER_UPDATE);
+#elif defined(__GNUC__) 
        c += sprintf(build, "using GNU C compiler gcc %d.%d.%d ", __GNUC__ , __GNUC_MINOR__ , __GNUC_PATCHLEVEL__);
 #endif
        sprintf(c,"at %s %s",__DATE__,__TIME__);

diff --git a/src/apps/bufrtotac_io.c b/src/apps/bufrtotac_io.c
@@ -111,7 +111,7 @@ void print_version()
    bufr2tac_get_version(version, build, builder, NULL, NULL, NULL);
    printf ("Linked to bufr2tac library version '%s' built %s and %s.\n", version, build, builder);
    bufrdeco_get_version(version, build, builder, NULL, NULL, NULL);
-   printf ("Linked to decobufr library version '%s' built %s and %s.\n", version, build, builder);
+   printf ("Linked to bufrdeco library version '%s' built %s and %s.\n", version, build, builder);
 }
 
 

diff --git a/src/bufrdeco/bufrdeco.c b/src/bufrdeco/bufrdeco.c
@@ -53,9 +53,9 @@ char *bufrdeco_get_version(char *version, char *build, char *builder, int *versi
   if (build)
     {
        c = build;
-#ifdef __INTEL_COMPILER
-       c += sprintf(build, "using INTEL C compiler icc %s ", __INTEL_COMPILER);
-#elifdef __GNUC__ 
+#if defined(__INTEL_COMPILER)
+       c += sprintf(build, "using INTEL C compiler icc %d.%d ", __INTEL_COMPILER, __INTEL_COMPILER_UPDATE);
+#elif defined(__GNUC__) 
        c += sprintf(build, "using GNU C compiler gcc %d.%d.%d ", __GNUC__ , __GNUC_MINOR__ , __GNUC_PATCHLEVEL__);
 #endif
        sprintf(c,"at %s %s",__DATE__,__TIME__);

diff --git a/src/libraries/bufr2tac.c b/src/libraries/bufr2tac.c
@@ -54,9 +54,9 @@ char *bufr2tac_get_version(char *version, char *build, char *builder, int *versi
   if (build)
     {
        c = build;
-#ifdef __INTEL_COMPILER
-       c += sprintf(build, "using INTEL C compiler icc %s ", __INTEL_COMPILER);
-#elifdef __GNUC__ 
+#if defined(__INTEL_COMPILER)
+       c += sprintf(build, "using INTEL C compiler icc %d.%d ", __INTEL_COMPILER, __INTEL_COMPILER_UPDATE);
+#elif defined(__GNUC__) 
        c += sprintf(build, "using GNU C compiler gcc %d.%d.%d ", __GNUC__ , __GNUC_MINOR__ , __GNUC_PATCHLEVEL__);
 #endif
        sprintf(c,"at %s %s",__DATE__,__TIME__);