Merge 75e1abafd6 into 4db99f4012
This commit is contained in:
commit
7ec2bd98bb
|
|
@ -204,7 +204,6 @@ void options(int, char **);
|
||||||
OPLIST * opt_next(void);
|
OPLIST * opt_next(void);
|
||||||
int bad_opt(void);
|
int bad_opt(void);
|
||||||
int mkpath(char *);
|
int mkpath(char *);
|
||||||
char *chdname;
|
|
||||||
#if !HAVE_NBTOOL_CONFIG_H
|
#if !HAVE_NBTOOL_CONFIG_H
|
||||||
int do_chroot;
|
int do_chroot;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -214,6 +214,8 @@ int havechd = 0;
|
||||||
* parser
|
* parser
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
char *chdname;
|
||||||
|
|
||||||
void
|
void
|
||||||
options(int argc, char **argv)
|
options(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ public:
|
||||||
|
|
||||||
~ValueMap() {}
|
~ValueMap() {}
|
||||||
|
|
||||||
bool hasMD() const { return MDMap; }
|
bool hasMD() const { return (bool)MDMap; }
|
||||||
MDMapT &MD() {
|
MDMapT &MD() {
|
||||||
if (!MDMap)
|
if (!MDMap)
|
||||||
MDMap.reset(new MDMapT);
|
MDMap.reset(new MDMapT);
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,8 @@ extern float meta_fract;
|
||||||
|
|
||||||
|
|
||||||
/* shared structure between udf_create.c users */
|
/* shared structure between udf_create.c users */
|
||||||
struct udf_create_context context;
|
extern struct udf_create_context context;
|
||||||
struct udf_disclayout layout;
|
extern struct udf_disclayout layout;
|
||||||
|
|
||||||
/* prototypes */
|
/* prototypes */
|
||||||
int udf_write_sector(void *sector, uint64_t location);
|
int udf_write_sector(void *sector, uint64_t location);
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,10 @@ __RCSID("$NetBSD: udf_create.c,v 1.25 2015/06/16 23:18:55 christos Exp $");
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* shared structure between udf_create.c users */
|
||||||
|
struct udf_create_context context;
|
||||||
|
struct udf_disclayout layout;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* NOTE that there is some overlap between this code and the udf kernel fs.
|
* NOTE that there is some overlap between this code and the udf kernel fs.
|
||||||
* This is intentially though it might better be factored out one day.
|
* This is intentially though it might better be factored out one day.
|
||||||
|
|
|
||||||
|
|
@ -192,6 +192,8 @@ char *makeDependfile;
|
||||||
pid_t myPid;
|
pid_t myPid;
|
||||||
int makelevel;
|
int makelevel;
|
||||||
|
|
||||||
|
FILE *debug_file;
|
||||||
|
|
||||||
Boolean forceJobs = FALSE;
|
Boolean forceJobs = FALSE;
|
||||||
|
|
||||||
extern Lst parseIncPath;
|
extern Lst parseIncPath;
|
||||||
|
|
|
||||||
|
|
@ -440,7 +440,7 @@ extern pid_t myPid;
|
||||||
* There is one bit per module. It is up to the module what debug
|
* There is one bit per module. It is up to the module what debug
|
||||||
* information to print.
|
* information to print.
|
||||||
*/
|
*/
|
||||||
FILE *debug_file; /* Output written here - default stdout */
|
extern FILE *debug_file; /* Output written here - default stdout */
|
||||||
extern int debug;
|
extern int debug;
|
||||||
#define DEBUG_ARCH 0x00001
|
#define DEBUG_ARCH 0x00001
|
||||||
#define DEBUG_COND 0x00002
|
#define DEBUG_COND 0x00002
|
||||||
|
|
|
||||||
|
|
@ -48,13 +48,11 @@ __RCSID("$NetBSD: machines.c,v 1.39 2014/02/24 07:23:44 skrll Exp $");
|
||||||
*/
|
*/
|
||||||
struct ib_mach
|
struct ib_mach
|
||||||
ib_mach_alpha,
|
ib_mach_alpha,
|
||||||
ib_mach_amd64,
|
|
||||||
ib_mach_amiga,
|
ib_mach_amiga,
|
||||||
ib_mach_emips,
|
ib_mach_emips,
|
||||||
ib_mach_ews4800mips,
|
ib_mach_ews4800mips,
|
||||||
ib_mach_hp300,
|
ib_mach_hp300,
|
||||||
ib_mach_hppa,
|
ib_mach_hppa,
|
||||||
ib_mach_i386,
|
|
||||||
ib_mach_landisk,
|
ib_mach_landisk,
|
||||||
ib_mach_macppc,
|
ib_mach_macppc,
|
||||||
ib_mach_news68k,
|
ib_mach_news68k,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user