mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
Avoid in-function #if directives.
* src/parthelper.c [!PED_PARTITION_PROTECTED]: Define to 0. Remove in-function #ifdefs.
This commit is contained in:
parent
1e43bebf69
commit
fe394e0baa
@ -1,3 +1,9 @@
|
|||||||
|
Tue Apr 29 15:20:12 CEST 2008 Jim Meyering <meyering@redhat.com>
|
||||||
|
|
||||||
|
Avoid in-function #if directives.
|
||||||
|
* src/parthelper.c [!PED_PARTITION_PROTECTED]: Define to 0.
|
||||||
|
Remove in-function #ifdefs.
|
||||||
|
|
||||||
Tue Apr 29 09:15:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
|
Tue Apr 29 09:15:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
|
||||||
|
|
||||||
* src/parthelper.c: Don't fail if PED_PARTITION_PROTECTED
|
* src/parthelper.c: Don't fail if PED_PARTITION_PROTECTED
|
||||||
|
@ -35,6 +35,12 @@
|
|||||||
#include <parted/parted.h>
|
#include <parted/parted.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
/* Make the comparisons below fail if your parted headers
|
||||||
|
are so old that they lack the definition. */
|
||||||
|
#ifndef PED_PARTITION_PROTECTED
|
||||||
|
# define PED_PARTITION_PROTECTED 0
|
||||||
|
#endif
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
PedDevice *dev;
|
PedDevice *dev;
|
||||||
@ -67,10 +73,8 @@ int main(int argc, char **argv)
|
|||||||
content = "free";
|
content = "free";
|
||||||
else if (part->type & PED_PARTITION_METADATA)
|
else if (part->type & PED_PARTITION_METADATA)
|
||||||
content = "metadata";
|
content = "metadata";
|
||||||
#ifdef PED_PARTITION_PROTECTED
|
|
||||||
else if (part->type & PED_PARTITION_PROTECTED)
|
else if (part->type & PED_PARTITION_PROTECTED)
|
||||||
content = "protected";
|
content = "protected";
|
||||||
#endif
|
|
||||||
else
|
else
|
||||||
content = "data";
|
content = "data";
|
||||||
} else if (part->type == PED_PARTITION_EXTENDED) {
|
} else if (part->type == PED_PARTITION_EXTENDED) {
|
||||||
@ -82,10 +86,8 @@ int main(int argc, char **argv)
|
|||||||
content = "free";
|
content = "free";
|
||||||
else if (part->type & PED_PARTITION_METADATA)
|
else if (part->type & PED_PARTITION_METADATA)
|
||||||
content = "metadata";
|
content = "metadata";
|
||||||
#ifdef PED_PARTITION_PROTECTED
|
|
||||||
else if (part->type & PED_PARTITION_PROTECTED)
|
else if (part->type & PED_PARTITION_PROTECTED)
|
||||||
content = "protected";
|
content = "protected";
|
||||||
#endif
|
|
||||||
else
|
else
|
||||||
content = "data";
|
content = "data";
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user