Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

This commit is contained in:
Brian Behlendorf 2009-10-14 15:57:09 -07:00
parent 410802e85a a8adb61c00
commit 9ea3f53d0c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libefi/include/sys/efi_partition.h
View File

@ -26,8 +26,6 @@
#ifndef _SYS_EFI_PARTITION_H #ifndef _SYS_EFI_PARTITION_H
#define _SYS_EFI_PARTITION_H #define _SYS_EFI_PARTITION_H
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/uuid.h> #include <sys/uuid.h>
#ifdef __cplusplus #ifdef __cplusplus
@ -221,7 +219,11 @@ struct partition64 {
/* /*
* Number of EFI partitions * Number of EFI partitions
*/ */
#if defined(__linux__)
#define EFI_NUMPAR 128 /* Expected by parted-1.8.1 */
#else
#define EFI_NUMPAR 9 #define EFI_NUMPAR 9
#endif
#ifndef _KERNEL #ifndef _KERNEL
extern int efi_alloc_and_init(int, uint32_t, struct dk_gpt **); extern int efi_alloc_and_init(int, uint32_t, struct dk_gpt **);

2
lib/libefi/include/sys/uuid.h
View File

@ -27,8 +27,6 @@
#ifndef _SYS_UUID_H #ifndef _SYS_UUID_H
#define _SYS_UUID_H #define _SYS_UUID_H
#pragma ident "%Z%%M% %I% %E% SMI"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif