Imported Upstream version 24.2

[rrq/maintain_lilo.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 268a9fea0fb89ae9fb41604dc64b76e003c141e7..29bbaecabf9487580925dadbf3d8ed3c36b5ad7d 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -1,15 +1,13 @@
-#if 0
-  common.h  -  Common data structures and functions.
-
-Copyright 1992-1998 Werner Almesberger.
-Copyright 1999-2005 John Coffman.
-All rights reserved.
-
-Licensed under the terms contained in the file 'COPYING' in the 
-source directory.
-
-
-#endif
+/* common.h  -  Common data structures and functions
+ * 
+ * Copyright 1992-1998 Werner Almesberger
+ * Copyright 1999-2005 John Coffman
+ * Copyright 2009-2015 Joachim Wiedorn
+ * All rights reserved.
+ * 
+ * Licensed under the terms contained in the file 'COPYING'
+ * in the source directory.
+ */
 
 #ifndef COMMON_H
 #define COMMON_H
@@ -21,6 +19,9 @@ source directory.
 #include <sys/stat.h>
 #endif
 
+#include <inttypes.h>
+#define PTR_WIDTH ((int) (sizeof(intptr_t) * 2))
+
 #ifndef PAGE_SIZE
 # define PAGE_SIZE 4096U
 #endif
@@ -396,11 +397,12 @@ extern int dm_major_nr;
 #define comma (cc(First)|cc(Second)|cc(Third)|cc(Bitmap)|cc(Chain)|cc(Mbr)|cc(Mbr2))
 
 
-/*volatile*/ void pdie(char *msg);
+/*volatile*/ void pdie(const char *msg) __attribute__ ((noreturn));
 /* Do a perror and then exit. */
 
 
-/*volatile*/ void die(char *fmt,...);
+/*volatile*/ void __attribute__ ((format (printf, 1, 2)))
+ __attribute__ ((noreturn)) die(const char *fmt,...);
 /* fprintf an error message and then exit. */