[illumos-gate merge]20140821release-20140821

commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
    5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
    5092 env files don't need to define LOCKNAME by default
    5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
    4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
    5066 remove support for non-ANSI compilation
    5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
    5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86

Manifests:
	usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
	usr/src/pkg/manifests/SUNWparted.mf (torch headers)
	usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
	usr/src/pkg/manifests/system-storage-parted.mf

1 files changed, 0 insertions, 82 deletions

diff --git a/usr/src/cmd/parted/ui.h b/usr/src/cmd/parted/ui.h
deleted file mode 100644
index f5cf760abf..0000000000
--- a/usr/src/cmd/parted/ui.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    parted - a frontend to libparted
-    Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef UI_H_INCLUDED
-#define UI_H_INCLUDED
-
-#include "strlist.h"
-
-extern char*	prog_name;
-
-extern int init_ui ();
-extern int non_interactive_mode (PedDevice** dev, Command* cmd_list[],
-				 int argc, char* argv[]);
-extern int interactive_mode (PedDevice** dev, Command* cmd_list[]);
-extern void done_ui ();
-
-extern int screen_width ();
-extern void wipe_line ();
-
-extern void command_line_push_word (const char* word);
-extern char* command_line_pop_word ();
-extern char* command_line_peek_word ();
-extern void command_line_flush ();
-extern int command_line_get_word_count ();
-extern void command_line_prompt_words (const char* prompt, const char* def,
-				       const StrList* possibilities,
-				       int multi_word);
-extern char* command_line_get_word (const char* prompt, const char* def,
-				    const StrList* possibilities,
-				    int multi_word);
-extern int command_line_get_integer (const char* prompt, int* value);
-extern int command_line_get_sector (const char* prompt, PedDevice* dev,
-				    PedSector* value, PedGeometry** range);
-extern int command_line_get_state (const char* prompt, int* value);
-extern int command_line_get_device (const char* prompt, PedDevice** value);
-extern int command_line_get_disk (const char* prompt, PedDisk** value);
-extern int command_line_get_partition (const char* prompt, PedDisk* disk,
-				       PedPartition** value);
-extern int command_line_get_fs_type (const char* prompt,
-				     const PedFileSystemType*(* value));
-extern int command_line_get_disk_type (const char* prompt,
-				       const PedDiskType*(* value));
-extern int command_line_get_part_flag (const char* prompt,
-				       const PedPartition* part,
-				       PedPartitionFlag* flag);
-extern int command_line_get_part_type (const char* prompt, const PedDisk* disk,
-				       PedPartitionType* type);
-extern PedExceptionOption command_line_get_ex_opt (const char* prompt,
-						   PedExceptionOption options);
-extern int command_line_get_unit (const char* prompt, PedUnit* unit);
-
-extern int command_line_is_integer ();
-extern int command_line_is_sector ();
-
-extern void help_msg ();
-
-extern void print_using_dev (PedDevice* dev);
-
-/* in parted.c */
-extern int	opt_script_mode;
-extern int	pretend_input_tty;
-
-extern void print_options_help ();
-extern void print_commands_help ();
-
-
-#endif /* UI_H_INCLUDED */