We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent c576303 commit b035c6fCopy full SHA for b035c6f
pivy-zfs.c
@@ -208,7 +208,15 @@ cmd_unlock(const char *fsname)
208
zfs_handle_t *ds;
209
nvlist_t *props, *prop;
210
char *description;
211
+ /*
212
+ * illumos libnvpair has the output args as 'char **'
213
+ * but on ZoL they changed it to 'const char **'
214
+ */
215
+#if defined(__sun)
216
+ char *b64;
217
+#else
218
const char *b64;
219
+#endif
220
char *nb64;
221
struct sshbuf *buf;
222
struct ebox *ebox, *nebox;
@@ -391,7 +399,11 @@ cmd_rekey(const char *fsname)
391
399
392
400
393
401
402
403
404
394
405
406
395
407
396
408
397
409
struct ebox *ebox = NULL, *nebox;
0 commit comments