diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-21 13:24:56 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-21 13:24:56 -0500 |
| commit | 696467e74a4bcf47c2bd3444dd7c1aeedbae50bf (patch) | |
| tree | 924de18265dc0be51357e1a33f5a92e945044299 /cddl/contrib/opensolaris/tools/ctf/cvt/output.c | |
| parent | 07def894aa89bea6d85dd76d201343a4a2e73046 (diff) | |
| parent | ceb7b147e676803c22cf6d815f543f21fd9aa926 (diff) | |
| download | FreeBSD-src-696467e74a4bcf47c2bd3444dd7c1aeedbae50bf.zip FreeBSD-src-696467e74a4bcf47c2bd3444dd7c1aeedbae50bf.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'cddl/contrib/opensolaris/tools/ctf/cvt/output.c')
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/output.c b/cddl/contrib/opensolaris/tools/ctf/cvt/output.c index af79769..3131e7f 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/output.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/output.c @@ -576,7 +576,7 @@ write_file(Elf *src, const char *srcname, Elf *dst, const char *dstname, shdr.sh_name); } -#if !defined(sun) +#ifndef illumos if (gelf_update_shdr(dscn, &shdr) == 0) elfterminate(dstname, "Cannot update sect %s", sname); #endif @@ -585,7 +585,7 @@ write_file(Elf *src, const char *srcname, Elf *dst, const char *dstname, elfterminate(srcname, "Cannot get sect %s data", sname); if ((ddata = elf_newdata(dscn)) == NULL) elfterminate(dstname, "Can't make sect %s data", sname); -#if defined(sun) +#ifdef illumos bcopy(sdata, ddata, sizeof (Elf_Data)); #else /* @@ -645,7 +645,7 @@ write_file(Elf *src, const char *srcname, Elf *dst, const char *dstname, } } -#if !defined(sun) +#ifndef illumos if (ddata->d_buf == NULL && sdata->d_buf != NULL) { ddata->d_buf = xmalloc(shdr.sh_size); bcopy(sdata->d_buf, ddata->d_buf, shdr.sh_size); |
