diff options
| author | martin <martin@NetBSD.org> | 2021-04-30 14:07:02 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2021-04-30 14:07:02 +0000 |
| commit | fa2651f9f4a5d315b1165e87ac57ff3eebfcb695 (patch) | |
| tree | af4f926659e4604404e646ddfa004f27787771a4 /sbin | |
| parent | 94c02085334103bbc93aa6545b5bc8e41bd7e4ab (diff) | |
Pull up following revision(s) (requested by mrg in ticket #1263):
bin/pax/options.c: revision 1.119
usr.bin/config/scan.l: revision 1.32
usr.bin/make/main.c: revision 1.274
bin/pax/extern.h: revision 1.60
usr.bin/config/defs.h: revision 1.106
usr.bin/make/make.h: revision 1.105
sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
usr.bin/config/main.c: revision 1.100
Avoid depending on common symbols.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/newfs_udf/newfs_udf.h | 6 | ||||
| -rw-r--r-- | sbin/newfs_udf/udf_create.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/newfs_udf/newfs_udf.h b/sbin/newfs_udf/newfs_udf.h index 6cb1603030f..c290685c227 100644 --- a/sbin/newfs_udf/newfs_udf.h +++ b/sbin/newfs_udf/newfs_udf.h @@ -1,4 +1,4 @@ -/* $NetBSD: newfs_udf.h,v 1.6 2019/06/30 11:38:16 sevan Exp $ */ +/* $NetBSD: newfs_udf.h,v 1.6.2.1 2021/04/30 14:07:02 martin Exp $ */ /* * Copyright (c) 2006, 2008, 2013 Reinoud Zandijk @@ -54,10 +54,6 @@ extern int meta_perc; extern float meta_fract; -/* shared structure between udf_create.c users */ -struct udf_create_context context; -struct udf_disclayout layout; - /* prototypes */ int udf_write_sector(void *sector, uint64_t location); int udf_update_trackinfo(struct mmc_discinfo *di, struct mmc_trackinfo *ti); diff --git a/sbin/newfs_udf/udf_create.c b/sbin/newfs_udf/udf_create.c index 8111a1ad3e0..021697a537a 100644 --- a/sbin/newfs_udf/udf_create.c +++ b/sbin/newfs_udf/udf_create.c @@ -1,4 +1,4 @@ -/* $NetBSD: udf_create.c,v 1.26 2018/12/09 17:52:48 christos Exp $ */ +/* $NetBSD: udf_create.c,v 1.26.2.1 2021/04/30 14:07:02 martin Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -30,7 +30,7 @@ #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: udf_create.c,v 1.26 2018/12/09 17:52:48 christos Exp $"); +__RCSID("$NetBSD: udf_create.c,v 1.26.2.1 2021/04/30 14:07:02 martin Exp $"); #include <stdio.h> #include <stdlib.h> @@ -52,6 +52,10 @@ __RCSID("$NetBSD: udf_create.c,v 1.26 2018/12/09 17:52:48 christos Exp $"); # 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. * This is intentially though it might better be factored out one day. |
