Add 'extern "C"' wrappers and #include guards to various header files.

svn path=/trunk/; revision=40321

1 files changed, 7 insertions, 0 deletions

diff --git a/file.h b/file.h
index 842e48608a..facf0f1d40 100644
--- a/file.h
+++ b/file.h
@@ -34,6 +34,9 @@
 
 #include "cfile.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /** Return values from functions that only can succeed or fail. */
 typedef enum {
@@ -581,4 +584,8 @@ cf_merge_files(char **out_filename, int in_file_count,
 void read_keytab_file(const char *);
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* file.h */