From 7257d1b4d25bfac0c802847390e98a464fd787ac Mon Sep 17 00:00:00 2001 From: raf Date: Fri, 6 Jun 2008 14:02:15 -0700 Subject: PSARC 2008/309 expunge synonyms.h 6700179 expunge synonyms.h --HG-- rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c --- usr/src/lib/libc/port/gen/confstr.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'usr/src/lib/libc/port/gen/confstr.c') diff --git a/usr/src/lib/libc/port/gen/confstr.c b/usr/src/lib/libc/port/gen/confstr.c index d2837ed2da..5cc2afb7f8 100644 --- a/usr/src/lib/libc/port/gen/confstr.c +++ b/usr/src/lib/libc/port/gen/confstr.c @@ -18,16 +18,17 @@ * * CDDL HEADER END */ + /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak confstr = _confstr +#pragma weak _confstr = confstr -#include "synonyms.h" +#include "lint.h" #include "xpg6.h" #include #include @@ -101,11 +102,11 @@ confstr(int name, char *buf, size_t length) if (name == _CS_PATH) { if (__xpg6 & _C99SUSv3_XPG6_sysconf_version) - path = "/usr/xpg6/bin:/usr/xpg4/bin:/usr/ccs/bin:"\ - "/usr/bin:/opt/SUNWspro/bin"; + path = "/usr/xpg6/bin:/usr/xpg4/bin:/usr/ccs/bin:" + "/usr/bin:/opt/SUNWspro/bin"; else - path = "/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:"\ - "/opt/SUNWspro/bin"; + path = "/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:" + "/opt/SUNWspro/bin"; conf_length = strlen(path) + 1; if (length != 0) { -- cgit v1.2.3