On 21.08.2013 21:06, Vladimir 'φ-coder/phcoder' Serbinenko wrote: > Based on your work, current WIP patch. I've committed some parts of your > patch as well as my own fixes. Remainder is attached > Current problems: > -double/float is mostly a kludge > -build-grub-mkfont > -nm on OpenBSD doesn't accept same options as GNU one. > Only the first problem still remains.
=== modified file 'grub-core/lib/minilzo/lzoconf.h' --- grub-core/lib/minilzo/lzoconf.h 2011-08-14 09:39:31 +0000 +++ grub-core/lib/minilzo/lzoconf.h 2013-08-22 16:57:12 +0000 @@ -53,7 +53,19 @@ # include <config.h> #endif #include <limits.h> +#if !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) +#undef double +#undef float +#define double signed long long +#define float signed long long +#endif #include <stddef.h> +#if !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) +#undef double +#undef float +#define double __grub_poison +#define float __grub_poison +#endif /***********************************************************************
=== modified file 'grub-core/lib/minilzo/minilzo.c' --- grub-core/lib/minilzo/minilzo.c 2011-08-14 09:39:31 +0000 +++ grub-core/lib/minilzo/minilzo.c 2013-08-22 16:57:12 +0000 @@ -58,7 +58,20 @@ # include <config.h> #endif #include <limits.h> +#if !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) +#undef double +#undef float +#define double signed long long +#define float signed long long +#endif #include <stddef.h> +#if !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) +#undef double +#undef float +#define double __grub_poison +#define float __grub_poison +#endif + #if defined(MINILZO_CFG_USE_INTERNAL_LZODEFS) #ifndef __LZODEFS_H_INCLUDED === modified file 'grub-core/lib/posix_wrap/sys/types.h' --- grub-core/lib/posix_wrap/sys/types.h 2013-04-14 17:57:15 +0000 +++ grub-core/lib/posix_wrap/sys/types.h 2013-08-22 16:57:12 +0000 @@ -21,10 +21,22 @@ #include <grub/misc.h> -#ifndef __APPLE__ +#if !defined (__APPLE__) && !defined (__OpenBSD__) typedef grub_size_t size_t; #else +#if !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) +#undef double +#undef float +#define double signed long long +#define float signed long long +#endif #include <stddef.h> +#if !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU) +#undef double +#undef float +#define double __grub_poison +#define float __grub_poison +#endif #endif typedef grub_ssize_t ssize_t; #ifndef GRUB_POSIX_BOOL_DEFINED
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Bug-grub mailing list Bug-grub@gnu.org https://lists.gnu.org/mailman/listinfo/bug-grub
