blob: 662185371a1e7ff60ce2d0d63f483eb2f2da0933 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
diff -uNr lilo-21.7.4/geometry.c lilo-21.7.4.patched/geometry.c
--- lilo-21.7.4/geometry.c Mon Apr 30 01:55:01 2001
+++ lilo-21.7.4.patched/geometry.c Mon Apr 30 01:59:15 2001
@@ -14,10 +14,21 @@
#define _I386_STATFS_H /* two versions of statfs is not good ... */
#endif
-#include <linux/fs.h>
-#include <linux/hdreg.h>
-#include <linux/fd.h>
#include <string.h>
+#include <linux/kdev_t.h> /* for major and minor macros */
+#ifndef BMAP_IOCTL
+#define BMAP_IOCTL 1 /* obsolete - kept for compatibility */
+#endif
+#ifndef FIBMAP
+#define FIBMAP _IO(0x00,1) /* bmap access */
+#endif
+#ifndef FIGETBSZ
+#define FIGETBSZ _IO(0x00,2)
+#endif
+
+#include <sys/statfs.h>
+#include <linux/fd.h> /* for fdgetprm */
+#include <linux/hdreg.h> /* for hdio_getgeo */
#include "config.h"
#include "lilo.h"
diff -uNr lilo-21.7.5.orig/partition.c lilo-21.7.5/partition.c
--- lilo-21.7.5.orig/partition.c Tue Apr 10 19:48:57 2001
+++ lilo-21.7.5/partition.c Sat Feb 2 18:52:14 2002
@@ -17,8 +17,15 @@
#include <limits.h>
#include <errno.h>
#include <sys/stat.h>
-#include <linux/fs.h>
#include <string.h>
+
+#if 0
+#define _LINUX_STRING_H_
+#include <linux/fs.h>
+#else
+#include <linux/kdev_t.h>
+#endif
+
#include "config.h"
#include "lilo.h"
#include "common.h"
@@ -28,9 +35,9 @@
#include "partition.h"
#include "boot.h"
-
/* For older kernels ... */
-
+/* hrmph... Gentoo is 2.4 kernel based anyway... */
+/*
#ifndef DOS_EXTENDED_PARTITION
#define DOS_EXTENDED_PARTITION EXTENDED_PARTITION
#endif
@@ -38,7 +45,7 @@
#ifndef LINUX_EXTENDED_PARTITION
#define LINUX_EXTENDED_PARTITION EXTENDED_PARTITION
#endif
-
+*/
void part_verify(int dev_nr,int type)
{
|
GitWeb
