Portability: don't use __BEGIN_DECLS and __END_DECLS.

diff --git a/include/gedcom.h.in b/include/gedcom.h.in
index 6482c97edfe337a568e4b7c6143949c492faa431..263f9fba4d34055f46943ab1b3088e571bb4769b 100644 (file)
--- a/include/gedcom.h.in
+++ b/include/gedcom.h.in
@@ -27,7 +27,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifndef GEDCOM_INTERNAL
 #include <gedcom-tags.h>
@@ -504,6 +506,8 @@ int        gedcom_warning(const char* s, ...);
 int        gedcom_message(const char* s, ...);
 int        gedcom_debug_print(const char* s, ...);
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __GEDCOM_H */

diff --git a/include/gom.h b/include/gom.h
index f0952e9e9c8581c4c616d762f066686831615965..5e33076404b26e914615bef67033328fc3179e8b 100644 (file)
--- a/include/gom.h
+++ b/include/gom.h
@@ -26,7 +26,9 @@
 
 #include "gedcom.h"
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* Sub-structures */
 
@@ -414,6 +416,7 @@ struct user_rec {
 /* Functions */
 
 int  gom_parse_file(const char *file_name);
+int  gom_new_model();
 
 struct header*     gom_get_header();
 struct submission* gom_get_submission();
@@ -449,6 +452,8 @@ char* gom_get_string_locale(char* data, int* conversion_failures);
 char* gom_set_string_locale(char** data, const char* locale_value);
 void  gom_set_unknown(const char* unknown);
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __GEDCOM_GOM_H */