diff options
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libc/port/gen/nlspath_checks.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/locale/localeimpl.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libfakekernel/common/kmem.c | 10 | ||||
| -rw-r--r-- | usr/src/lib/libfakekernel/common/mapfile-vers | 2 | ||||
| -rw-r--r-- | usr/src/lib/libfakekernel/common/taskq.c | 1 | ||||
| -rw-r--r-- | usr/src/lib/libficl/Makefile.com | 5 |
6 files changed, 12 insertions, 12 deletions
diff --git a/usr/src/lib/libc/port/gen/nlspath_checks.c b/usr/src/lib/libc/port/gen/nlspath_checks.c index fb63ec8e6a..f06b564cb0 100644 --- a/usr/src/lib/libc/port/gen/nlspath_checks.c +++ b/usr/src/lib/libc/port/gen/nlspath_checks.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include "mtlib.h" #include <string.h> @@ -626,7 +624,7 @@ clean_env(void) else if (issetugid()) { /* Found and set-uid, clean */ int off = 1; - for (p++; (p[-off] = p[0]) != '\0'; p++) + for (p++; (p[-off] = p[0]) != NULL; p++) if (**p == 'N' && nvmatch("NLSPATH", *p) != NULL) off++; diff --git a/usr/src/lib/libc/port/locale/localeimpl.c b/usr/src/lib/libc/port/locale/localeimpl.c index f7e3ab240f..9083e0f16b 100644 --- a/usr/src/lib/libc/port/locale/localeimpl.c +++ b/usr/src/lib/libc/port/locale/localeimpl.c @@ -146,7 +146,7 @@ static char *categories[7] = { * Prototypes. */ static const char *get_locale_env(int); -static struct locdata *locdata_get(int, const const char *); +static struct locdata *locdata_get(int, const char *); static struct locdata *locdata_get_cache(int, const char *); static locale_t mklocname(locale_t); diff --git a/usr/src/lib/libfakekernel/common/kmem.c b/usr/src/lib/libfakekernel/common/kmem.c index 18ebb89885..0c69bf5151 100644 --- a/usr/src/lib/libfakekernel/common/kmem.c +++ b/usr/src/lib/libfakekernel/common/kmem.c @@ -11,7 +11,7 @@ /* * Copyright 2013 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2017, Joyent, Inc. + * Copyright 2018, Joyent, Inc. */ #include <sys/kmem.h> @@ -126,7 +126,7 @@ kmem_cache_free(kmem_cache_t *kc, void *p) /* ARGSUSED */ void kmem_cache_set_move(kmem_cache_t *kc, - kmem_cbrc_t (*fun)(void *, void *, size_t, void *)) + kmem_cbrc_t (*fun)(void *, void *, size_t, void *)) { } @@ -142,12 +142,6 @@ kmem_cache_reap_soon(kmem_cache_t *kc) { } -/* ARGSUSED */ -void -kmem_cache_reap_now(kmem_cache_t *kc) -{ -} - /* uint64_t kmem_cache_stat(kmem_cache_t *, char *); */ /* ARGSUSED */ diff --git a/usr/src/lib/libfakekernel/common/mapfile-vers b/usr/src/lib/libfakekernel/common/mapfile-vers index 2aed6dfef2..1c41dd9b58 100644 --- a/usr/src/lib/libfakekernel/common/mapfile-vers +++ b/usr/src/lib/libfakekernel/common/mapfile-vers @@ -13,6 +13,7 @@ # Copyright 2015 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2017, Joyent, Inc. # Copyright 2017 RackTop Systems. +# Copyright 2018, Joyent, Inc. # # @@ -204,6 +205,7 @@ SYMBOL_VERSION SUNWprivate_1.1 { taskq_destroy; taskq_dispatch; taskq_dispatch_ent; + taskq_empty; taskq_member; taskq_empty; taskq_wait; diff --git a/usr/src/lib/libfakekernel/common/taskq.c b/usr/src/lib/libfakekernel/common/taskq.c index be734f9096..c445557d3f 100644 --- a/usr/src/lib/libfakekernel/common/taskq.c +++ b/usr/src/lib/libfakekernel/common/taskq.c @@ -27,6 +27,7 @@ * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2017, Joyent, Inc. * Copyright 2017 RackTop Systems. + * Copyright 2018, Joyent, Inc. */ #include <sys/taskq_impl.h> diff --git a/usr/src/lib/libficl/Makefile.com b/usr/src/lib/libficl/Makefile.com index 505e0d27f4..cdf4419df0 100644 --- a/usr/src/lib/libficl/Makefile.com +++ b/usr/src/lib/libficl/Makefile.com @@ -31,6 +31,11 @@ FICLDIR= $(SRC)/common/ficl C99MODE= $(C99_ENABLE) CPPFLAGS += -I.. -I$(FICLDIR) -D_LARGEFILE64_SOURCE=1 +# As variable "count" is marked volatile, gcc 4.4.4 will complain about +# function argument. So we switch this warning off +# for time being, till gcc 4.4.4 will be replaced. +pics/vm.o := CERRWARN += -_gcc=-Wno-clobbered + LDLIBS += -luuid -lc -lm -lumem HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficltokens.h ../ficllocal.h \ |