$OpenBSD: patch-src_ljtypes_c,v 1.2 2004/01/02 22:09:23 espie Exp $
--- src/ljtypes.c.orig	2002-12-04 05:55:54.000000000 +0100
+++ src/ljtypes.c	2004-01-02 23:03:20.000000000 +0100
@@ -279,12 +279,12 @@ addtextchildenc(xmlDocPtr doc, xmlNodePt
 
 #define XML_ENTRY_META_GET(A)                                                \
     if ((!strcmp(cur->name, #A))) {	                                     \
-        entry->##A = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); \
+        entry->A = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); \
     }
 
 #define XML_ENTRY_META_SET(A)                            \
-	if (entry->##A)                                 \
-		addtextchildenc(doc, root, #A, entry->##A);
+	if (entry->A)                                 \
+		addtextchildenc(doc, root, #A, entry->A);
 
 static xmlDocPtr
 entry_to_xml(Entry *entry) {
@@ -443,7 +443,7 @@ static gboolean
 rfc822_load_entry(const char *key, const char *val, Entry *entry) {
 #define RFC822_GET(A)                 \
     if (g_ascii_strcasecmp(key, #A) == 0) { \
-        entry->##A = g_strdup(val);   \
+        entry->A = g_strdup(val);   \
     }
 
 	RFC822_GET(subject)
@@ -662,7 +662,7 @@ entry_from_user_editor(const char *filen
 		gchar *editor =
 			(getenv("VISUAL") ? getenv("VISUAL") :
 			 getenv("EDITOR") ? getenv("EDITOR") : "vi");
-		execlp(editor, editor, filename, NULL);
+		execlp(editor, editor, filename, (void *)NULL);
 		_exit(0);
 	}
 
