diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-02-17 11:21:04 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-02-17 11:21:04 -0500 |
| commit | c97a57dc5369ecd7d8da38559b01a3fae91e20d4 (patch) | |
| tree | 99666d6c33a7205ea4479e4376cb2c503f2ce195 /usr/src/cmd/svr4pkg/installf/main.c | |
| parent | 708960ec010b67946164e0ce8a7d7a5047c98855 (diff) | |
| parent | 569041adf8e01f8f57e8a53463ab4478ffd71ec0 (diff) | |
| download | illumos-joyent-c97a57dc5369ecd7d8da38559b01a3fae91e20d4.tar.gz | |
[illumos-gate merge]
commit 569041adf8e01f8f57e8a53463ab4478ffd71ec0
13546 svr4pkg: symbol 'eptnum' is multiply-defined
commit 19a46add205c481c02687f802f63741bc0fd19ca
13537 ldap: multiply-defined symbols
commit 1d4c48c4c76a8b6a9ab91af4f76ca68c6556ad61
13536 lp: symbol 'lp_alloc_fail_handler' is multiply-defined
commit a6dda84350c269f3e2c54cc01367177554a7cbd8
13548 vgrind: multiply-defined symbols
commit 2a6858720cb70fb5eaddbfe3512fe5b55bcaf594
13522 x86pi.so: multiply-defined symbols
commit aeaf55833f532850471446fb8721ef54e0b9a36d
13516 loader.efi: efifb_mask_from_pixfmt is missing PixelBltOnly
Diffstat (limited to 'usr/src/cmd/svr4pkg/installf/main.c')
| -rw-r--r-- | usr/src/cmd/svr4pkg/installf/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/cmd/svr4pkg/installf/main.c b/usr/src/cmd/svr4pkg/installf/main.c index 9d6775620a..53d7c6b48e 100644 --- a/usr/src/cmd/svr4pkg/installf/main.c +++ b/usr/src/cmd/svr4pkg/installf/main.c @@ -103,7 +103,7 @@ #define LINK 1 -extern char dbst; /* libinst/pkgdbmerg.c */ +extern char dbst; /* libinst/pkgdbmerg.c */ struct cfextra **extlist; struct pinfo **eptlist; @@ -111,11 +111,10 @@ struct pinfo **eptlist; char *classname = NULL; char *pkginst; char *uniTmp; -char *abi_sym_ptr; -char *ulim; -char *script; +char *abi_sym_ptr; +char *ulim; +char *script; -int eptnum; int nosetuid; int nocnflct; int warnflag = 0; |