summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-05-24 20:19:25 +0300
committerToomas Soome <tsoome@me.com>2021-02-17 23:24:07 +0200
commit3f423849d2afa35883f6feac478a08bdc8a1e68e (patch)
treeb6fdef331bd5817f5dc099a0343f9db6bed72395 /usr/src
parentb0d8599cdab985a41de495bf1f4f1bb56cdbef3c (diff)
downloadillumos-joyent-3f423849d2afa35883f6feac478a08bdc8a1e68e.tar.gz
13544 rmformat: symbol 'uscsi_error' is multiply-defined
Reviewed by: C Fraire <cfraire@me.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/rmformat/rmformat.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/cmd/rmformat/rmformat.h b/usr/src/cmd/rmformat/rmformat.h
index dcf9228a51..416cc13e73 100644
--- a/usr/src/cmd/rmformat/rmformat.h
+++ b/usr/src/cmd/rmformat/rmformat.h
@@ -27,8 +27,6 @@
#ifndef _RMFORMAT_H
#define _RMFORMAT_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* This file contents the definitions for rmformat utility
*/
@@ -134,7 +132,7 @@ extern "C" {
#define INQUIRY_DATA_LENGTH 96
#define DVD_CONFIG_SIZE 0x20
-int uscsi_error; /* used for debugging failed uscsi */
+extern int uscsi_error; /* used for debugging failed uscsi */
/* fdisk related structures */