Skip to content

Commit 85a76d8

Browse files
committed
Use preprocessor for the _ped module and what constants to include.
The > test for flags doesn't work because there are too many possibilities. So you get > 15 passing, but the macro expected doesn't exist. Signed-off-by: David Cantrell <dcantrell@redhat.com>
1 parent e70fcfa commit 85a76d8

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/_pedmodule.c

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -654,16 +654,21 @@ MOD_INIT(_ped) {
654654
* Conditionally add constants, based on PED_PARTITION_LAST_FLAG, and what
655655
* we know about parted/disk.h
656656
*/
657-
if (PED_PARTITION_LAST_FLAG > 15)
658-
PyModule_AddIntConstant(m, "PARTITION_MSFT_DATA", PED_PARTITION_MSFT_DATA);
659-
if (PED_PARTITION_LAST_FLAG > 16)
660-
PyModule_AddIntConstant(m, "PARTITION_IRST", PED_PARTITION_IRST);
661-
if (PED_PARTITION_LAST_FLAG > 17)
662-
PyModule_AddIntConstant(m, "PARTITION_ESP", PED_PARTITION_ESP);
663-
if (PED_PARTITION_LAST_FLAG > 18)
664-
PyModule_AddIntConstant(m, "PARTITION_CHROMEOS_KERNEL", PED_PARTITION_CHROMEOS_KERNEL);
665-
if (PED_PARTITION_LAST_FLAG > 19)
666-
PyModule_AddIntConstant(m, "PARTITION_BLS_BOOT", PED_PARTITION_BLS_BOOT);
657+
#if defined(PED_PARTITION_MSFT_DATA)
658+
PyModule_AddIntConstant(m, "PARTITION_MSFT_DATA", PED_PARTITION_MSFT_DATA);
659+
#endif
660+
#if defined(PED_PARTITION_IRST)
661+
PyModule_AddIntConstant(m, "PARTITION_IRST", PED_PARTITION_IRST);
662+
#endif
663+
#if defined(PED_PARTITION_ESP)
664+
PyModule_AddIntConstant(m, "PARTITION_ESP", PED_PARTITION_ESP);
665+
#endif
666+
#if defined(PED_PARTITION_CHROMEOS_KERNEL)
667+
PyModule_AddIntConstant(m, "PARTITION_CHROMEOS_KERNEL", PED_PARTITION_CHROMEOS_KERNEL);
668+
#endif
669+
#if defined(PED_PARTITION_BLS_BOOT)
670+
PyModule_AddIntConstant(m, "PARTITION_BLS_BOOT", PED_PARTITION_BLS_BOOT);
671+
#endif
667672

668673
PyModule_AddIntConstant(m, "DISK_CYLINDER_ALIGNMENT", PED_DISK_CYLINDER_ALIGNMENT);
669674
PyModule_AddIntConstant(m, "DISK_GPT_PMBR_BOOT", PED_DISK_GPT_PMBR_BOOT);

0 commit comments

Comments
 (0)