Add externs to avoid multiple definitions, and then add missing definitions.

[rrq/maintain_lilo.git] / src / edit.c

diff --git a/src/edit.c b/src/edit.c
index 2630fbe280990a3afedeb80571a7e3275f7e57c5..ded9c38d0629f19bd8a640e0417a28a272bb53eb 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -1,12 +1,12 @@
-/* edit.c -- bitmap file manipulation and editing */
-/*
-Copyright 2002-2004 John Coffman.
-All rights reserved.
-
-Licensed under the terms contained in the file 'COPYING' in the 
-source directory.
-
-*/
+/* edit.c  -  Bitmap file manipulation and editing
+ * 
+ * Copyright 2002-2004 John Coffman
+ * Copyright 2009-2015 Joachim Wiedorn
+ * All rights reserved.
+ * 
+ * Licensed under the terms contained in the file 'COPYING'
+ * in the source directory.
+ */
 
 #define _GNU_SOURCE
 #include <unistd.h>
@@ -193,7 +193,7 @@ static      union {
        } tm;
 static MENUTABLE *menu = &tm.mt;
 static BITMAPLILOHEADER *lh = (void*)(tm.buffer +
-                       ((long)&tm.mt.row - (long)&tm.bmlh.row));
+                       ((intptr_t)&tm.mt.row - (intptr_t)&tm.bmlh.row));
 
 /* a convenience definition */
 #define mn tm.mt