diff options
Diffstat (limited to 'usr/src/lib/libc/port/regex/regex.c')
| -rw-r--r-- | usr/src/lib/libc/port/regex/regex.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/usr/src/lib/libc/port/regex/regex.c b/usr/src/lib/libc/port/regex/regex.c index 369e2b813f..769761daef 100644 --- a/usr/src/lib/libc/port/regex/regex.c +++ b/usr/src/lib/libc/port/regex/regex.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,12 +37,11 @@ * */ -#pragma weak regex = _regex +#pragma weak _regex = regex +#include "lint.h" /* CONSTANTS SHARED WITH regcmp() */ #include "regex.h" - -#include "synonyms.h" #include "mtlib.h" #include <limits.h> #include <stdarg.h> @@ -161,7 +159,7 @@ char *__loc1; char ** ____loc1(void) { - if (_thr_main()) + if (thr_main()) return (&__loc1); return ((char **)tsdalloc(_T_REGEX_LOC1, sizeof (char *), NULL)); } @@ -171,8 +169,7 @@ ____loc1(void) /* DEFINITION OF regex() */ extern char * -_regex(const char *regexp, - const char *stringp, ...) +regex(const char *regexp, const char *stringp, ...) { va_list arg_listp; int char_size; |