← Back to branch summary

~ubuntu-branches/ubuntu/trusty/grub2/trusty-updates

« back to all changes in this revision

Viewing changes to loader/macho32.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-02-08 11:39:26 UTC
  • mfrom: (17.6.26 experimental)
  • mto: (17.6.27 experimental)
  • mto: This revision was merged to the branch mainline in revision 104.
  • Revision ID: james.westby@ubuntu.com-20110208113926-clfs90haboyk9zip
Tags: 1.99~rc1-2
https://launchpad.net/bugs/712029
https://launchpad.net/bugs/712029
* Merge 1.98+20100804-13 and 1.98+20100804-14, updating translations:
  - Kazakh (Baurzhan Muftakhidinov / Timur Birsh).
* mkconfig_skip_dmcrypt.patch: Refer to GRUB_PRELOAD_MODULES rather than
  suggesting people write a /etc/grub.d/01_modules script (thanks, Jordan
  Uggla).
* Handle empty dir passed to grub_find_root_device_from_mountinfo; fixes
  grub-mkrelpath on btrfs subvolumes (LP: #712029).
* Add rootflags=subvol=<name> if / is on a btrfs subvolume (LP: #712029).
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loader/macho32.c
1
 
#include <grub/cpu/macho.h>
2
 
#include <grub/machoload.h>
3
 
 
4
 
#define SUFFIX(x) x ## 32
5
 
typedef struct grub_macho_header32 grub_macho_header_t;
6
 
typedef struct grub_macho_segment32 grub_macho_segment_t;
7
 
typedef grub_uint32_t grub_macho_addr_t;
8
 
typedef struct grub_macho_thread32 grub_macho_thread_t;
9
 
#define offsetXX offset32
10
 
#define ncmdsXX ncmds32
11
 
#define cmdsizeXX cmdsize32
12
 
#define cmdsXX cmds32
13
 
#define endXX end32
14
 
#define XX "32"
15
 
#define GRUB_MACHO_MAGIC GRUB_MACHO_MAGIC32
16
 
#define GRUB_MACHO_CMD_SEGMENT GRUB_MACHO_CMD_SEGMENT32
17
 
#include "machoXX.c"
18