rpms/gnu-efi/devel gnu-efi-3.0d-uefi_wrap.patch,1.1,1.2

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/gnu-efi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17928

Modified Files:
	gnu-efi-3.0d-uefi_wrap.patch 
Log Message:
get rid of totally bogus #ifdef


gnu-efi-3.0d-uefi_wrap.patch:

Index: gnu-efi-3.0d-uefi_wrap.patch
===================================================================
RCS file: /cvs/extras/rpms/gnu-efi/devel/gnu-efi-3.0d-uefi_wrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnu-efi-3.0d-uefi_wrap.patch	19 Dec 2007 20:18:49 -0000	1.1
+++ gnu-efi-3.0d-uefi_wrap.patch	11 Jan 2008 21:06:40 -0000	1.2
@@ -1,6 +1,6 @@
-diff -urNp ../gnu-efi-3.0d/lib/x86_64/callwrap.c gnu-efi-3.0d_mod/lib/x86_64/callwrap.c
---- ../gnu-efi-3.0d/lib/x86_64/callwrap.c	2007-05-11 10:03:05.000000000 -0700
-+++ gnu-efi-3.0d_mod/lib/x86_64/callwrap.c	2007-06-06 17:39:12.000000000 -0700
+diff -urpN gnu-efi-3.0d/lib/x86_64/callwrap.c.uefi_wrap gnu-efi-3.0d/lib/x86_64/callwrap.c
+--- gnu-efi-3.0d/lib/x86_64/callwrap.c.uefi_wrap	2007-05-11 13:03:05.000000000 -0400
++++ gnu-efi-3.0d/lib/x86_64/callwrap.c	2008-01-11 16:02:40.000000000 -0500
 @@ -1,28 +1,328 @@
 -/*++
 -
@@ -486,3 +486,19 @@
 +		return EFI_LOAD_ERROR;
 +	}
  }
+diff -urpN gnu-efi-3.0d/inc/x86_64/efibind.h.uefi_wrap gnu-efi-3.0d/inc/x86_64/efibind.h
+--- gnu-efi-3.0d/inc/x86_64/efibind.h.uefi_wrap	2008-01-11 16:02:58.000000000 -0500
++++ gnu-efi-3.0d/inc/x86_64/efibind.h	2008-01-11 16:03:21.000000000 -0500
+@@ -257,12 +257,7 @@ typedef uint64_t   UINTN;
+ #endif
+ #endif
+ 
+-/* for x86_64, EFI_FUNCTION_WRAPPER must be defined */
+-#ifdef  EFI_FUNCTION_WRAPPER
+ UINTN uefi_call_wrapper(void *func, unsigned long va_num, ...);
+-#else
+-#error "EFI_FUNCTION_WRAPPER must be defined for x86_64 architecture"
+-#endif
+ 
+ #if _MSC_EXTENSIONS
+ #pragma warning ( disable : 4731 )  // Suppress warnings about modification of EBP