Pass complete concatenated text in end callback.

[gedcom-parse.git] / gom / gom_internal.h

diff --git a/gom/gom_internal.h b/gom/gom_internal.h
index d00ca74ed6217d894e9f541c612d477ede41d4f8..829b13d584e9ff1019e6e4d526e63787b6f9f4fa 100644 (file)
--- a/gom/gom_internal.h
+++ b/gom/gom_internal.h
@@ -27,16 +27,20 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libintl.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "gom.h"
 #include "gedcom.h"
-#ifdef WITH_DMALLOC
-#include <dmalloc.h>
-#endif
       
-#define _(string) gettext(string)
+#define _(string) dgettext(PACKAGE, string)
 #define N_(string) (string)
 
+#ifdef __GNUC__
 #define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
 
 typedef enum {
   T_NULL,
@@ -96,7 +100,7 @@ void gom_mem_error(const char *filename, int line);
 
 #define MEMORY_ERROR gom_mem_error(__FILE__, __LINE__)
 
-void def_rec_end(Gedcom_rec rec, Gedcom_ctxt self);
+void def_rec_end(Gedcom_rec rec, Gedcom_ctxt self, Gedcom_val parsed_value);
 void def_elt_end(Gedcom_elt elt, Gedcom_ctxt parent,
                 Gedcom_ctxt self, Gedcom_val parsed_value);
 void set_xref_type(struct xref_value *xr, const char* str);