OSDN Git Service

Fix a makeguids building problem with generics.h.
authorPeter Jones <pjones@redhat.com>
Wed, 20 Jun 2018 18:12:42 +0000 (14:12 -0400)
committerPeter Jones <pjones@redhat.com>
Wed, 20 Jun 2018 21:23:22 +0000 (17:23 -0400)
Guard generics.h with EFIVAR_BUILD_ENVIRONMENT to keep it from
interfering with the makeguids build if libefivar.so isn't around
already.

Signed-off-by: Peter Jones <pjones@redhat.com>
src/generics.h

index e6af2fa..66be4bd 100644 (file)
@@ -17,6 +17,7 @@
  *
  */
 
+#ifndef EFIVAR_BUILD_ENVIRONMENT
 #ifndef LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H
 #define LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H 1
 
@@ -182,3 +183,4 @@ generic_append_variable(efi_guid_t guid, const char *name,
 }
 
 #endif /* LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H */
+#endif /* EFIVAR_BUILD_ENVIRONMENT */