Some changes to safe_buffer structure.

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

diff --git a/gom/gom_internal.h b/gom/gom_internal.h
index 86e34ab0b67ecbcfc33f139c1286b149de18dd72..91a693215224e313e8d2727f88283696b4988f5f 100644 (file)
--- a/gom/gom_internal.h
+++ b/gom/gom_internal.h
@@ -27,13 +27,13 @@
 #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__
@@ -100,17 +100,11 @@ 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);
 
-typedef enum {
-  WITHOUT_NL,
-  WITH_NL
-} NL_TYPE;
-
-char* concat_strings(NL_TYPE type, char *str1, const char *str2);
 struct date_value* dup_date(struct date_value dv);
 struct age_value*  dup_age(struct age_value age);
 
@@ -163,11 +157,18 @@ void NULL_DESTROY(void* anything);
                      char *raw_value UNUSED, int parsed_tag UNUSED,           \
                      Gedcom_val parsed_value UNUSED
 
+#define _REC_END_PARAMS_ Gedcom_rec rec UNUSED, Gedcom_ctxt self UNUSED,      \
+                         Gedcom_val parsed_value UNUSED
+
 #define _ELT_PARAMS_ Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED,        \
                      int level UNUSED, char *tag UNUSED,                      \
                      char *raw_value UNUSED, int parsed_tag UNUSED,           \
                      Gedcom_val parsed_value UNUSED
 
+#define _ELT_END_PARAMS_ Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED,    \
+                         Gedcom_ctxt self UNUSED,                             \
+                         Gedcom_val parsed_value UNUSED
+
 #define REC_CB(STRUCTTYPE,CB_NAME,FUNC)                                       \
   Gedcom_ctxt CB_NAME(_REC_PARAMS_)                                           \
   {                                                                           \