diff options
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/libdns_sd/Makefile.com | 1 | ||||
| -rw-r--r-- | usr/src/lib/libdns_sd/common/dnssd_clientlib.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libdns_sd/java/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/lib/libdns_sd/java/common/JNISupport.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libfru/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libfru/sparcv9/Makefile | 2 |
7 files changed, 16 insertions, 6 deletions
diff --git a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c index eb91f5212d..6409c299ca 100644 --- a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c +++ b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c @@ -20,6 +20,7 @@ */ /* + * Copyright 2016 Toomas Soome <tsoome@me.com> * Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -622,7 +623,7 @@ zfs_ioctl(sysret_t *rval, int fdes, int cmd, intptr_t arg) } struct s10_lofi_ioctl { - uint32_t li_minor; + uint32_t li_id; boolean_t li_force; char li_filename[MAXPATHLEN + 1]; }; @@ -652,7 +653,7 @@ lofi_ioctl(sysret_t *rval, int fdes, int cmd, intptr_t arg) bzero(&native_param, sizeof (native_param)); - struct_assign(native_param, s10_param, li_minor); + struct_assign(native_param, s10_param, li_id); struct_assign(native_param, s10_param, li_force); /* @@ -665,7 +666,7 @@ lofi_ioctl(sysret_t *rval, int fdes, int cmd, intptr_t arg) err = __systemcall(rval, SYS_ioctl + 1024, fdes, cmd, &native_param); - struct_assign(s10_param, native_param, li_minor); + struct_assign(s10_param, native_param, li_id); /* li_force is input-only */ bcopy(native_param.li_filename, s10_param.li_filename, diff --git a/usr/src/lib/libdns_sd/Makefile.com b/usr/src/lib/libdns_sd/Makefile.com index ca83ad0396..5775bdb1e7 100644 --- a/usr/src/lib/libdns_sd/Makefile.com +++ b/usr/src/lib/libdns_sd/Makefile.com @@ -38,6 +38,7 @@ LDLIBS += -lsocket -lnsl -lc C99MODE = $(C99_ENABLE) CPPFLAGS += -I$(SRCDIR) -DNOT_HAVE_SA_LEN -D_XPG4_2 -D__EXTENSIONS__ +CPPFLAGS += -DMDNS_VERSIONSTR_NODTS .PARALLEL = $(OBJECTS) .KEEP_STATE: diff --git a/usr/src/lib/libdns_sd/common/dnssd_clientlib.c b/usr/src/lib/libdns_sd/common/dnssd_clientlib.c index cca5885333..c22e54db61 100644 --- a/usr/src/lib/libdns_sd/common/dnssd_clientlib.c +++ b/usr/src/lib/libdns_sd/common/dnssd_clientlib.c @@ -363,4 +363,8 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex // NOT static -- otherwise the compiler may optimize it out // The "@(#) " pattern is a special prefix the "what" command looks for +#ifndef MDNS_VERSIONSTR_NODTS const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")"; +#else +const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion); +#endif diff --git a/usr/src/lib/libdns_sd/java/Makefile.com b/usr/src/lib/libdns_sd/java/Makefile.com index f66463ac2f..8a8133ba95 100644 --- a/usr/src/lib/libdns_sd/java/Makefile.com +++ b/usr/src/lib/libdns_sd/java/Makefile.com @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" LIBRARY= libjdns_sd.a VERS= .1 @@ -39,6 +38,7 @@ C99MODE = $(C99_ENABLE) CPPFLAGS += -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris CPPFLAGS += -I../com/apple/dnssd CPPFLAGS += -D_REENTRANT +CPPFLAGS += -DMDNS_VERSIONSTR_NODTS LDLIBS += -lc -lsocket -ldns_sd diff --git a/usr/src/lib/libdns_sd/java/common/JNISupport.c b/usr/src/lib/libdns_sd/java/common/JNISupport.c index 22b40930a2..af4de19912 100644 --- a/usr/src/lib/libdns_sd/java/common/JNISupport.c +++ b/usr/src/lib/libdns_sd/java/common/JNISupport.c @@ -1069,4 +1069,8 @@ exit: // NOT static -- otherwise the compiler may optimize it out // The "@(#) " pattern is a special prefix the "what" command looks for +#ifndef MDNS_VERSIONSTR_NODTS const char VersionString_SCCS[] = "@(#) libjdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")"; +#else +const char VersionString_SCCS[] = "@(#) libjdns_sd " STRINGIFY(mDNSResponderVersion); +#endif diff --git a/usr/src/lib/libfru/amd64/Makefile b/usr/src/lib/libfru/amd64/Makefile index 230c18efea..071807c9e0 100644 --- a/usr/src/lib/libfru/amd64/Makefile +++ b/usr/src/lib/libfru/amd64/Makefile @@ -28,7 +28,7 @@ include ../Makefile.obj include ../../Makefile.lib.64 include ../Makefile.flag -LDLIBS += -lc -m64 +LDLIBS += -lc LDLIBS += -L$(SRC)/lib/libfruutils/$(MACH64) -lfruutils LDLIBS += -L$(SRC)/lib/libfru/libfrureg/$(MACH64) -lfrureg diff --git a/usr/src/lib/libfru/sparcv9/Makefile b/usr/src/lib/libfru/sparcv9/Makefile index 00e0af18cc..80a2b3d484 100644 --- a/usr/src/lib/libfru/sparcv9/Makefile +++ b/usr/src/lib/libfru/sparcv9/Makefile @@ -29,7 +29,7 @@ include ../Makefile.obj include ../../Makefile.lib.64 include ../Makefile.flag -LDLIBS += -lc -m64 +LDLIBS += -lc LDLIBS += -L$(SRC)/lib/libfruutils/$(MACH64) -lfruutils LDLIBS += -L$(SRC)/lib/libfru/libfrureg/$(MACH64) -lfrureg |