svn commit: r287335 - head/cddl/contrib/opensolaris/lib/libzpool/common/sys

[Allan Jude]

Author: allanjude
Date: Mon Aug 31 22:36:17 2015
New Revision: 287335
URL: https://svnweb.freebsd.org/changeset/base/287335

Log:
  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

Modified:
  head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h

Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Mon Aug 31 20:44:52 2015	(r287334)
+++ head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Mon Aug 31 22:36:17 2015	(r287335)
@@ -655,13 +655,6 @@ extern int zfs_secpolicy_rename_perms(co
 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)