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

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

diff --git a/src/probe.h b/src/probe.h
index c384c4fd77957d6da767b68b534ff3e0a6770529..edd5f8d61e88b78aa4f6400475b4cd354de73bca 100644 (file)
--- a/src/probe.h
+++ b/src/probe.h
@@ -1,18 +1,17 @@
-/* probe.h  -- definitions for the LILO probe utility
-
-Copyright 1999-2005 John Coffman.
-All rights reserved.
-
-Licensed under the terms contained in the file 'COPYING' in the 
-source directory.
-
-*/
+/* probe.h  -  BIOS probe utility
+ * 
+ * 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 __PROBE_H_
 #define __PROBE_H_
 
 
-
 struct disk_geom {
    unsigned int n_total_blocks;
    int n_sect;
@@ -35,7 +34,7 @@ struct disk_param {
    unsigned int n_cyl;
    unsigned int n_head;
    unsigned int n_sect;
-   long long n_sectors;
+   int64_t n_sectors;
    short n_byte;
    unsigned int edd_config_ptr;
 };
@@ -211,7 +210,7 @@ struct Edd {
    unsigned int  cylinders;
    unsigned int  heads;
    unsigned int  sectors;
-   long long      total_sectors;
+   int64_t        total_sectors;
    unsigned short sector_size;
 
    unsigned short offset,