X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;ds=sidebyside;f=gom%2Fgom_internal.h;h=2038c267433f54ce24024a4df8c5fe2c00008d57;hb=e5f86c3d527897be1f7e7135ffdfc023831aaebd;hp=d1b7706ed0306220ef7daa7fd3e9121bd587992d;hpb=4c445928c8f7d30731a66522ffb9747fe13a3243;p=gedcom-parse.git

diff --git a/gom/gom_internal.h b/gom/gom_internal.h
index d1b7706..2038c26 100644
--- a/gom/gom_internal.h
+++ b/gom/gom_internal.h
@@ -27,15 +27,21 @@
 #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,
   
@@ -95,8 +101,8 @@ 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_elt_end(Gedcom_elt elt, Gedcom_ctxt parent, 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 {
@@ -152,11 +158,15 @@ void NULL_DESTROY(void* anything);
     }                                                                         \
   }
 
-#define _REC_PARAMS_ Gedcom_rec rec, int level, Gedcom_val xref, char *tag,   \
-                     char *raw_value, int parsed_tag, Gedcom_val parsed_value
+#define _REC_PARAMS_ Gedcom_rec rec UNUSED, int level UNUSED,                 \
+                     Gedcom_val xref UNUSED, char *tag UNUSED,                \
+                     char *raw_value UNUSED, int parsed_tag UNUSED,           \
+                     Gedcom_val parsed_value UNUSED
 
-#define _ELT_PARAMS_ Gedcom_elt elt, Gedcom_ctxt parent, int level, char *tag,\
-                     char *raw_value, int parsed_tag, Gedcom_val parsed_value
+#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 REC_CB(STRUCTTYPE,CB_NAME,FUNC)                                       \
   Gedcom_ctxt CB_NAME(_REC_PARAMS_)                                           \