Merge from trunk.

1 files changed, 14 insertions, 23 deletions

diff --git a/libc/sysdeps/linux/common/sbrk.c b/libc/sysdeps/linux/common/sbrk.c
index d8507335b..d9a4d6899 100644
--- a/libc/sysdeps/linux/common/sbrk.c
+++ b/libc/sysdeps/linux/common/sbrk.c
@@ -1,47 +1,38 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
 
 #include <unistd.h>
 #include <errno.h>
 
+libc_hidden_proto(sbrk)
+
+libc_hidden_proto(brk)
+
 /* Defined in brk.c.  */
 extern void *__curbrk;
-extern int __brk (void *addr) attribute_hidden;
-
+libc_hidden_proto(__curbrk)
 
 /* Extend the process's data space by INCREMENT.
    If INCREMENT is negative, shrink data space by - INCREMENT.
    Return start of new space allocated, or -1 for errors.  */
-void attribute_hidden * __sbrk (intptr_t increment)
+void * sbrk (intptr_t increment)
 {
     void *oldbrk;
 
     if (__curbrk == NULL)
-	if (__brk (0) < 0)		/* Initialize the break.  */
+	if (brk (0) < 0)		/* Initialize the break.  */
 	    return (void *) -1;
 
     if (increment == 0)
 	return __curbrk;
 
     oldbrk = __curbrk;
-    if (__brk (oldbrk + increment) < 0)
+    if (brk (oldbrk + increment) < 0)
 	return (void *) -1;
 
     return oldbrk;
 }
-strong_alias(__sbrk,sbrk)
+libc_hidden_def(sbrk)