diff options
Diffstat (limited to 'libc/misc/file')
| -rw-r--r-- | libc/misc/file/Makefile | 50 | ||||
| -rw-r--r-- | libc/misc/file/lockf.c | 2 | ||||
| -rw-r--r-- | libc/misc/file/lockf64.c | 2 |
3 files changed, 10 insertions, 44 deletions
diff --git a/libc/misc/file/Makefile b/libc/misc/file/Makefile index a590f6ab5..4a8f4a072 100644 --- a/libc/misc/file/Makefile +++ b/libc/misc/file/Makefile @@ -1,47 +1,13 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> # -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU Library General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) any -# later version. +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -# This program 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 Library General Public License for more -# details. -# -# You should have received a copy of the GNU Library General Public License -# along with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Derived in part from the Linux-8086 C library, the GNU C Library, and several -# other sundry sources. Files within this library are copyright by their -# respective copyright holders. - -TOPDIR=../../../ -include $(TOPDIR)Rules.mak - -ifeq ($(strip $(UCLIBC_HAS_LFS)),y) -CSRC = lockf.c lockf64.c -else -CSRC = lockf.c -endif -COBJS=$(patsubst %.c,%.o, $(CSRC)) -OBJS=$(COBJS) - -OBJ_LIST=../../obj.misc.file - -all: $(OBJ_LIST) - -$(OBJ_LIST): $(OBJS) - echo $(patsubst %, misc/file/%, $(OBJS)) > $(OBJ_LIST) - -$(COBJS): %.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o -clean: - $(RM) *.[oa] *~ core +top_srcdir=../../../ +top_builddir=../../../ +all: objs +include $(top_builddir)Rules.mak +include Makefile.in +include $(top_srcdir)Makerules diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c index f95b24fac..0962031da 100644 --- a/libc/misc/file/lockf.c +++ b/libc/misc/file/lockf.c @@ -28,7 +28,7 @@ int lockf (int fd, int cmd, off_t len) { struct flock fl; - memset ((char *) &fl, '\0', sizeof (fl)); + __memset ((char *) &fl, '\0', sizeof (fl)); /* lockf is always relative to the current file position. */ fl.l_whence = SEEK_CUR; diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c index 5638d6938..eb70e8ddd 100644 --- a/libc/misc/file/lockf64.c +++ b/libc/misc/file/lockf64.c @@ -62,7 +62,7 @@ int lockf64 (int fd, int cmd, off64_t len64) return -1; } - memset((char *) &fl, '\0', sizeof (fl)); + __memset((char *) &fl, '\0', sizeof (fl)); /* lockf is always relative to the current file position. */ fl.l_whence = SEEK_CUR; |