diff options
Diffstat (limited to 'lib/libefivar/efivar.h')
| -rw-r--r-- | lib/libefivar/efivar.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/libefivar/efivar.h b/lib/libefivar/efivar.h index 2bdf92d35690..e159f4cccd3d 100644 --- a/lib/libefivar/efivar.h +++ b/lib/libefivar/efivar.h @@ -21,8 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _EFIVAR_H_ @@ -48,19 +46,14 @@ #endif -#ifndef _EFIVAR_EFI_GUID_T_DEF -#define _EFIVAR_EFI_GUID_T_DEF -typedef uuid_t efi_guid_t; -#endif - #if BYTE_ORDER == LITTLE_ENDIAN #define EFI_GUID(a, b, c, d, e0, e1, e2, e3, e4, e5) \ - ((efi_guid_t) {(a), (b), (c), (d) >> 8, (d) & 0xff, \ - { (e0), (e1), (e2), (e3), (e4), (e5) }}) + ((efi_guid_t) {(a), (b), (c), { (d) >> 8, (d) & 0xff, \ + (e0), (e1), (e2), (e3), (e4), (e5) }}) #else #define EFI_GUID(a, b, c, d, e0, e1, e2, e3, e4, e5) \ - ((efi_guid_t) {(a), (b), (c), (d) & 0xff, (d) >> 8, \ - { (e0), (e1), (e2), (e3), (e4), (e5) }}) + ((efi_guid_t) {(a), (b), (c), { (d) & 0xff, (d) >> 8, \ + (e0), (e1), (e2), (e3), (e4), (e5) }}) #endif #define EFI_GLOBAL_GUID EFI_GUID(0x8be4df61, 0x93ca, 0x11d2, 0xaa0d, \ @@ -87,14 +80,14 @@ int efi_str_to_guid(const char *s, efi_guid_t *guid); int efi_variables_supported(void); /* FreeBSD extensions */ -struct uuid_table +struct guid_table { const char *uuid_str; const char *name; efi_guid_t guid; }; -int efi_known_guid(struct uuid_table **); +int efi_known_guid(struct guid_table **); extern const efi_guid_t efi_guid_empty; |