git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebase master to b108
[zfs.git]
/
lib
/
libzpool
/
include
/
sys
/
zfs_context.h
diff --git
a/lib/libzpool/include/sys/zfs_context.h
b/lib/libzpool/include/sys/zfs_context.h
index
0e7019b
..
a50e4b0
100644
(file)
--- a/
lib/libzpool/include/sys/zfs_context.h
+++ b/
lib/libzpool/include/sys/zfs_context.h
@@
-19,7
+19,7
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 200
8
Sun Microsystems, Inc. All rights reserved.
+ * Copyright 200
9
Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
@@
-490,7
+490,7
@@
typedef struct callb_cpr {
/*
* Hostname information
*/
/*
* Hostname information
*/
-extern char hw_serial[];
+extern char hw_serial[];
/* for userland-emulated hostid access */
extern int ddi_strtoul(const char *str, char **nptr, int base,
unsigned long *result);
extern int ddi_strtoul(const char *str, char **nptr, int base,
unsigned long *result);