[svn-r28806] Merge from trunk:

    28792 - H5Epubgen.h extern C fix
    28788 - cleanup of new files in tfile.c

Merge from hdf5_1_10_alpha:
    28706 - only test (release-1) when release # > 0
            in major/minor/release checks

Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
           serial only

1 files changed, 12 insertions, 0 deletions

diff --git a/bin/make_err b/bin/make_err
index 4b1f474..1b39d53fb 100755
--- a/bin/make_err
+++ b/bin/make_err
@@ -175,6 +175,12 @@ sub create_public ($) {
     print_warning(*HEADER);
     print_startprotect(*HEADER, $file);
 
+    # Begin extern C block
+    print HEADER "\n";
+    print HEADER "#ifdef __cplusplus\n";
+    print HEADER "extern \"C\" {\n";
+    print HEADER "#endif\n";
+
     # Iterate over all the major errors
     print HEADER "\n/*********************/\n";
     print HEADER   "/* Major error codes */\n";
@@ -202,6 +208,12 @@ sub create_public ($) {
         }
     }
 
+    # End extern C block
+    print HEADER "\n";
+    print HEADER "#ifdef __cplusplus\n";
+    print HEADER "}\n";
+    print HEADER "#endif\n";
+
     print_endprotect(*HEADER, $file);
 
     # Close header file