diff options
Diffstat (limited to 'usr/src/cmd')
-rw-r--r-- | usr/src/cmd/acpi/acpidump/Makefile | 1 | ||||
-rw-r--r-- | usr/src/cmd/acpi/acpixtract/Makefile | 1 | ||||
-rw-r--r-- | usr/src/cmd/acpi/iasl/Makefile | 1 | ||||
-rw-r--r-- | usr/src/cmd/acpi/iasl/aslutils.c | 2 | ||||
-rw-r--r-- | usr/src/cmd/bhyve/Makefile | 1 | ||||
-rw-r--r-- | usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile | 1 | ||||
-rw-r--r-- | usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c | 9 | ||||
-rw-r--r-- | usr/src/cmd/sgs/libld/common/update.c | 2 | ||||
-rw-r--r-- | usr/src/cmd/svc/startd/restarter.c | 1 | ||||
-rw-r--r-- | usr/src/cmd/svc/startd/startd.h | 4 |
10 files changed, 13 insertions, 10 deletions
diff --git a/usr/src/cmd/acpi/acpidump/Makefile b/usr/src/cmd/acpi/acpidump/Makefile index 29efef7992..c6102b2275 100644 --- a/usr/src/cmd/acpi/acpidump/Makefile +++ b/usr/src/cmd/acpi/acpidump/Makefile @@ -30,6 +30,7 @@ CERRWARN += -_gcc=-Wno-unused-function SMOFF = all_func_returns CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_DUMP_APP +CPPFLAGS += -DACPI_DATE=\"$(VERSION)\" LDLIBS += -ldevinfo diff --git a/usr/src/cmd/acpi/acpixtract/Makefile b/usr/src/cmd/acpi/acpixtract/Makefile index e2446ec33d..875c54420d 100644 --- a/usr/src/cmd/acpi/acpixtract/Makefile +++ b/usr/src/cmd/acpi/acpixtract/Makefile @@ -31,6 +31,7 @@ VPATH = ../common:$(SRC)/common/acpica/utilities SMOFF = all_func_returns,macros CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_XTRACT_APP +CPPFLAGS += -DACPI_DATE=\"$(VERSION)\" .KEEP_STATE: diff --git a/usr/src/cmd/acpi/iasl/Makefile b/usr/src/cmd/acpi/iasl/Makefile index 80885ceb40..a762f324de 100644 --- a/usr/src/cmd/acpi/iasl/Makefile +++ b/usr/src/cmd/acpi/iasl/Makefile @@ -105,6 +105,7 @@ INTERMEDIATES = \ SMATCH=off CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_ASL_COMPILER -I. +CPPFLAGS += -DACPI_DATE=\"$(VERSION)\" LEX_C_FILES = aslcompilerlex.c dtparserlex.c prparserlex.c YACC_C_FILES = aslcompilerparse.c dtparserparse.c prparserparse.c diff --git a/usr/src/cmd/acpi/iasl/aslutils.c b/usr/src/cmd/acpi/iasl/aslutils.c index 16ef1f478f..e1bc50a26a 100644 --- a/usr/src/cmd/acpi/iasl/aslutils.c +++ b/usr/src/cmd/acpi/iasl/aslutils.c @@ -542,7 +542,7 @@ UtDisplaySummary ( /* Compiler name and version number */ FlPrintFile (FileId, "%s version %X [%s]\n\n", - ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, __DATE__); + ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_DATE); } /* Summary of main input and output files */ diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile index 4dc737c768..d9991287f0 100644 --- a/usr/src/cmd/bhyve/Makefile +++ b/usr/src/cmd/bhyve/Makefile @@ -140,6 +140,7 @@ C99MODE= -xc99=%all $(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -lsunw_crypto -luuid \ -lvmmapi -lz +NATIVE_LIBS += libz.so $(ZHYVE_PROG) := LDLIBS += -lnvpair $(MEVENT_TEST_PROG) := LDLIBS += -lsocket diff --git a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile index 9bc700ab29..8afabd17fe 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile @@ -26,6 +26,7 @@ SRCDIR= $(SRC)/contrib/mDNSResponder CFLAGS += $(CSTD_GNU99) CPPFLAGS += -I$(SRCDIR)/mDNSShared CPPFLAGS += -DmDNSResponderVersion=878.1.1 +CPPFLAGS += -DMDNS_VERSIONSTR_NODTS LDLIBS += -lsocket -ldns_sd # not linted diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c index 3dcd6972d3..c8806c9fe3 100644 --- a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c +++ b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Daktari platform platform specific environment monitoring policies */ @@ -98,7 +96,7 @@ static int dak_policy_debug = 0; #define GET_SENSOR_FAILED_MSG \ gettext("Failed to get sensor value, id = %s, errno = %d\n") #define ADD_PS_MSG \ -gettext("WARNING: Only 1 Power Supply in system. ADD a 2nd Power Supply.\n") + gettext("WARNING: Only 1 Power Supply in system. ADD a 2nd Power Supply.\n") #define REMOVE_LOAD_MSG \ gettext("WARNING: Power Supply at 95%% current. Remove some load.\n") #define PS_OVER_CURRENT_MSG \ @@ -201,7 +199,7 @@ static i2c_noise_param_t i2cparams[] = { static void i2cparams_debug(i2c_noise_param_t *pi2cparams, char *platform, - int usingDefaults) + int usingDefaults) { char s[128]; i2c_noise_param_t *p; @@ -1849,7 +1847,7 @@ psvc_check_disk_fault_policy_0(psvc_opaque_t hdlp, char *id) { int32_t status = PSVC_SUCCESS; int32_t i; - char curr_state[32], prev_state[32], led_state[32]; + char prev_state[32], led_state[32]; char disk_fault[32], disk_state[32]; static char *disk_id[DAK_MAX_DISKS] = {NULL}; static char *led_id[DAK_MAX_DISKS] = {NULL}; @@ -1884,7 +1882,6 @@ psvc_check_disk_fault_policy_0(psvc_opaque_t hdlp, char *id) } for (i = 0; i < DAK_MAX_DISKS; i++) { - curr_state[0] = 0; prev_state[0] = 0; status = psvc_get_attr(hdlp, disk_id[i], PSVC_PRESENCE_ATTR, diff --git a/usr/src/cmd/sgs/libld/common/update.c b/usr/src/cmd/sgs/libld/common/update.c index 7626520cd7..d61d4cfcd5 100644 --- a/usr/src/cmd/sgs/libld/common/update.c +++ b/usr/src/cmd/sgs/libld/common/update.c @@ -58,7 +58,7 @@ sym_hash_compare(Sym_s_list * s1, Sym_s_list * s2) * we need to examine the symbols the indices reference. It is safe, because * the linker is single threaded. */ -Sym *dynsort_compare_syms; +static Sym *dynsort_compare_syms; static int dynsort_compare(const void *idx1, const void *idx2) diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c index 516004c894..70f84a06d6 100644 --- a/usr/src/cmd/svc/startd/restarter.c +++ b/usr/src/cmd/svc/startd/restarter.c @@ -135,6 +135,7 @@ #include "startd.h" #include "protocol.h" +uu_list_pool_t *contract_list_pool; static uu_list_pool_t *restarter_instance_pool; static restarter_instance_list_t instance_list; diff --git a/usr/src/cmd/svc/startd/startd.h b/usr/src/cmd/svc/startd/startd.h index df3e98a27b..cf6e7e5cc5 100644 --- a/usr/src/cmd/svc/startd/startd.h +++ b/usr/src/cmd/svc/startd/startd.h @@ -325,7 +325,7 @@ typedef struct graph_vertex { * * Currently, only relevant for GVT_SVC and GVT_INST type vertices. */ - int gv_refs; + int gv_refs; int32_t gv_stn_tset; int32_t gv_reason; @@ -566,7 +566,7 @@ typedef struct contract_entry { extern volatile uint16_t storing_contract; -uu_list_pool_t *contract_list_pool; +extern uu_list_pool_t *contract_list_pool; /* contract.c */ ctid_t contract_init(void); |