]> git.pld-linux.org Git - packages/parted.git/commitdiff
- fix building with gcc-3.4
authorJarosław Kruk <jareq@pld-linux.org>
Tue, 21 Sep 2004 14:37:51 +0000 (14:37 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    parted-log2.patch -> 1.1
    parted-ped_partition_is_active.patch -> 1.1

parted-log2.patch [new file with mode: 0644]
parted-ped_partition_is_active.patch [new file with mode: 0644]

diff --git a/parted-log2.patch b/parted-log2.patch
new file mode 100644 (file)
index 0000000..dc2ab38
--- /dev/null
@@ -0,0 +1,21 @@
+diff -urN parted-1.6.12.orig/libparted/exception.c parted-1.6.12/libparted/exception.c
+--- parted-1.6.12.orig/libparted/exception.c   2002-04-08 12:08:27.000000000 +0200
++++ parted-1.6.12/libparted/exception.c        2004-09-21 13:18:49.000000000 +0200
+@@ -68,7 +68,7 @@
+ }
+ static int
+-log2 (int n)
++ped_log2 (int n)
+ {
+       int     x;
+       for (x=0; 1 << x <= n; x++);
+@@ -78,7 +78,7 @@
+ char*
+ ped_exception_get_option_string (PedExceptionOption ex_opt)
+ {
+-      return option_strings [log2 (ex_opt)];
++      return option_strings [ped_log2 (ex_opt)];
+ }
+ static PedExceptionOption
diff --git a/parted-ped_partition_is_active.patch b/parted-ped_partition_is_active.patch
new file mode 100644 (file)
index 0000000..4951342
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urN parted-1.6.12.orig/libparted/disk_dos.c parted-1.6.12/libparted/disk_dos.c
+--- parted-1.6.12.orig/libparted/disk_dos.c    2004-08-15 14:28:00.000000000 +0200
++++ parted-1.6.12/libparted/disk_dos.c 2004-09-21 13:59:18.000000000 +0200
+@@ -484,7 +484,7 @@
+       PED_ASSERT (part->disk != NULL, return);
+       PED_ASSERT (bios_geom != NULL, return);
+-      if (ped_partition_is_active) {
++      if (ped_partition_is_active (part)) {
+               if (probe_partition_for_geom (part, bios_geom))
+                       return;
+               if (part->type & PED_PARTITION_EXTENDED) {
This page took 0.199323 seconds and 4 git commands to generate.