diff options
| author | allanjude <allanjude@FreeBSD.org> | 2015-08-31 22:36:17 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2015-08-31 22:36:17 +0000 |
| commit | 97c6fe6d1e7e96a9606a6c4226fdb981931caee7 (patch) | |
| tree | fd7a8658c8f9aed9d3c706577ad79f15f974de80 /cddl | |
| parent | ccd91edd5193ed83c645eda0b8ab273c40faf82c (diff) | |
| download | FreeBSD-src-97c6fe6d1e7e96a9606a6c4226fdb981931caee7.zip FreeBSD-src-97c6fe6d1e7e96a9606a6c4226fdb981931caee7.tar.gz | |
Remove duplicate defines introduced in initial ZFS import (r168404)
This change reduces compiler warnings by removing duplicate defines
Line numbers are from r168404 (and r284648)
#define lbolt: lines 384 and 459 (531 and 648) (original was renamed later)
#define lbolt64: lines 385 and 460 (532 and 649) (original was renamed later)
#define gethrestime_sec: lines 390 and 465 (540 and 653)
uint64_t physmem: lines 402 and 463 (561 and 651)
Reviewed by: smh, delphij
Approved by: bapt (mentor)
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D2878
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h index 15ad5ed..22774af 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h +++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h @@ -655,13 +655,6 @@ extern int zfs_secpolicy_rename_perms(const char *from, const char *to, extern int zfs_secpolicy_destroy_perms(const char *name, cred_t *cr); extern zoneid_t getzoneid(void); /* Random compatibility stuff. */ -#define lbolt (gethrtime() >> 23) -#define lbolt64 (gethrtime() >> 23) - -extern uint64_t physmem; - -#define gethrestime_sec() time(NULL) - #define pwrite64(d, p, n, o) pwrite(d, p, n, o) #define readdir64(d) readdir(d) #define SIGPENDING(td) (0) |
