[BACK]Return to gpt.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sbin / gpt

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sbin/gpt/gpt.h between version 1.5.12.2 and 1.6

version 1.5.12.2, 2014/08/20 00:02:25 version 1.6, 2013/04/13 18:04:33
Line 30 
Line 30 
 #define _GPT_H_  #define _GPT_H_
   
 #include <sys/endian.h>  #include <sys/endian.h>
   #ifdef __FreeBSD__
   #include <sys/gpt.h>
   /*
    * XXX struct gpt_hdr is not a multiple of 8 bytes in size and thus
    * contains padding we must not include in the size.
    */
   #define GPT_SIZE offsetof(struct gpt_hdr, padding)
   #endif
   #ifdef __NetBSD__
 #include <sys/disklabel_gpt.h>  #include <sys/disklabel_gpt.h>
 #define GPT_SIZE GPT_HDR_SIZE  #define GPT_SIZE GPT_HDR_SIZE
 #define hdr_uuid hdr_guid  #define hdr_uuid hdr_guid
 #define ent_uuid ent_guid  #define ent_uuid ent_guid
   #endif
   
 #include <uuid.h>  #include <uuid.h>
   
   #ifdef __NetBSD__
 #define le_uuid_dec uuid_dec_le  #define le_uuid_dec uuid_dec_le
 #define le_uuid_enc uuid_enc_le  #define le_uuid_enc uuid_enc_le
   #else
   void    le_uuid_dec(void const *, uuid_t *);
   void    le_uuid_enc(void *, uuid_t const *);
   #endif
 int     parse_uuid(const char *, uuid_t *);  int     parse_uuid(const char *, uuid_t *);
   
 struct mbr_part {  struct mbr_part {
Line 80  uint8_t *utf16_to_utf8(uint16_t *);
Line 95  uint8_t *utf16_to_utf8(uint16_t *);
 void    utf8_to_utf16(const uint8_t *, uint16_t *, size_t);  void    utf8_to_utf16(const uint8_t *, uint16_t *, size_t);
   
 int     cmd_add(int, char *[]);  int     cmd_add(int, char *[]);
 int     cmd_backup(int, char *[]);  
 int     cmd_biosboot(int, char *[]);  int     cmd_biosboot(int, char *[]);
 int     cmd_create(int, char *[]);  int     cmd_create(int, char *[]);
 int     cmd_destroy(int, char *[]);  int     cmd_destroy(int, char *[]);
Line 88  int cmd_label(int, char *[]);
Line 102  int cmd_label(int, char *[]);
 int     cmd_migrate(int, char *[]);  int     cmd_migrate(int, char *[]);
 int     cmd_recover(int, char *[]);  int     cmd_recover(int, char *[]);
 int     cmd_remove(int, char *[]);  int     cmd_remove(int, char *[]);
 int     cmd_resize(int, char *[]);  
 int     cmd_restore(int, char *[]);  
 int     cmd_set(int, char *[]);  
 int     cmd_show(int, char *[]);  int     cmd_show(int, char *[]);
 int     cmd_unset(int, char *[]);  
   
 #endif /* _GPT_H_ */  #endif /* _GPT_H_ */

Legend:
Removed from v.1.5.12.2  
changed lines
  Added in v.1.6

CVSweb <webmaster@jp.NetBSD.org>